Merge branch 'js/rebase-i-final'