Merge changes Ic1302ac2,I43584b7f