Merge changes I930b316c,Iea4283e0,I103648f8 into release-4-6