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