Merge branch 'js/rebase-i-dedup-call-to-rerere'