Merge origin/release-4-6 into master