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