Merge branch 'backport-3.22-ci-msvc-19.31' into release-3.22

Merge-request: !7059