Merge changes Ibbc7da3a,I8efee06f