Merge branch 'pw/no-editor-in-rebase-i-implicit'