Merge branch 'js/rebase'