Merge changes I805ec065,Idc9995b1