Merge branch 'backport-3.21-vs2022' into vs2022