Merge branch 'FindOpenMP-Intel-Windows' into release-3.11

Merge-request: !1957