Fixes #9482
Merge branch 'develop'