Merge changes Ic2ca171a,I8542d9ba