Merge branch 'sh/rebase-i-reread-todo-after-exec'