Merge branch 'js/rebase-i-root-fix'