Merge branch 'js/rebase-i-p-test-fix' into next