Merge branch 'js/rebase-count-fixes'