Merge branch 'issue-921' into develop

6 jobs for develop in 15 minutes and 36 seconds (queued for 2 seconds)