Merge branch 'gerrit/release-4-5-patches' into release-4-6