Merge branch 'pw/rebase-reread-todo-after-editing'