Merge changes Idfa005ff,If9033cfa,I8921cf0d