Merge changes Ibe8d0d9f,I31935e1e,I0f1f3bee