Merge branch 'issue-901' into develop

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