Merge remote-tracking branch 'gerrit/release-4-6'