Merge changes Ic48b0970,Id372a645