Merge changes Idf3f69db,I4499d7c7,I512af911