Merge changes Ie852df32,I731a0066,I2e8558f1