Merge branch 'backport-3.22-ci-windows-no-java' into ci-windows-no-java