Merge "Fix ICC on Windows Build" into release-4-5-patches