Merge changes Idb112e86,Ia345251f