Merge changes Iede12655,I73fcc78e