Merge changes I018b69e8,Ia99c607c,Idc241d22