Merge changes Icd18348e,I0e642b1b,I304bec5e