Pull icc-cleanup into release branch