Merge changes I3c63ae50,Ida68d628,Ib1175765