Merge branch 'bld/icc' into next