Merge changes Ic8cadf33,If59b1dd3