Merge changes Ia52d9db2,Iab16430b