Merge branch 'bg/rebase-reword'