Merge branch 'js/ci-win-vs-build' into maint-2.46