Merge changes I3027d53f,I1233ebcc