*8826* Do not rebase, create a merge commit