Merge changes I3010d415,Ic0348306