Merge branch 'pw/rebase-i-show-HEAD-to-reword'