Merge changes I6cfb8b9d,Ifc9b24fc