Merge branch 'intel-std-fix' into release-3.12

Merge-request: !2206