Merge changes I3d0a9a7f,Iab983899