Merge "Merge release-4-5-patches into release-4-6" into release-4-6