Merge changes Ibc78f5be,Id1a6e6d2