Merge changes Ic7e83322,I2482a37c