Merge branch 'release-v4.6.0'