Merge in changes for ICC fix.