Merge branch 'release-4-6' into master