Merge changes I4f924144,Ib40ec862