Merge changes Ic4a5414a,I22f28b62