Merge branch 'js/parallel-test'