Merge branch 'backport-3.22-ci-vs2022' into ci-vs2022