Merge changes Ibdc6e3c8,I9bcb91a2