Merge branch 'tb/complete-rebase-i-edit-todo'