bugfix for #9760
Merge branch 'develop'