Merge latest ICF changes/fixes into Git master.