Merge branch 'release-4-6'