Merge branch 'js/rebase-p-tests'