Merge changes Ic5489af9,I65d5b96e