Merge changes Ic5856d81,I03f7300d