Merge remote-tracking branch 'origin/release-v4.6.1'