Merge changes Iec7fe7c0,I73f97f98