Try to fix #9720.
Merge branch 'develop'