Merge branch 'backport-IntelLLVM-depfile-flags' into release-3.22

Merge-request: !6964