Merge branch 'vs2022-v143-link-guard-cf' into release-3.21

Merge-request: !6858