task #9742
Merge branch 'version-4.6' into version-4.11