Merge "Merge branch 'release-4-6' into release-5-0" into release-5-0