Merge branch 'js/rebase-cleanup'