Merge changes Ibe0145be,I0764bfa9