Merge 3.5 (ICC)