Merge changes I296b2805,Iee01f474,I13dab228