Merge changes Ib64cf026,I238948da