Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'