Merge branch 'js/test-with-ws-in-path'