Merge branch 'develop' into 'issue-956'

Fixes #956
4 jobs for issue-956 in 16 minutes and 9 seconds (queued for 2 seconds)
latest