Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20

Merge-request: !6319