Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.23

Merge-request: !8041