Merge branch 'vs-intel-oneapi-toolset' into release-3.21

Merge-request: !6806