Merge branch 'develop' into 'master'

Detail the interplay between latest and previous

See merge request !65