Merge branch 'pw/rebase-edit-message-for-replayed-merge'