Merge branch 'js/rebase-i-p'