Merge branch 'backport-3.21-vs2022' into release-3.21

Merge-request: !6628