Merge branch 'issue-849' into develop

5 jobs for develop in 14 minutes and 35 seconds (queued for 2 seconds)