Merge changes I6a379ec4,I982a75a9,Id8a84b79,I423294a5,Iefe3d89a