[COMMIT 21.5] Patch to support Intel compiler on Windows