Merge branch 'jk/rebase-head-reflog'