Merge branch 'js/ci-windows-update' into maint