Merge branch 'icc-cleanup' into icc-next