Merge branch 'js/tests-windows-port-fix'