Merge changes Ic4fa9f76,I66b41f8c