Merge branch 'irsl-msvc-omp-fix' into release-3.10

Merge-request: !1588