Merge branch 'js/rebase-recreate-merge'