Merge changes If0c2f9d9,Ic2a8ad82 into release-4-5-patches