Merge branch 'IntelLLVM-no-xilink' into release-3.21

Merge-request: !6719