Merge branch 'js/test-help-format-windows-port-fix'