Merge branch 'js/rebase-deprecate-preserve-merges'