Merge branch '1.85' into 'develop'

Example fix and additions

See merge request !10