Merge branch 'aw/rebase-i-edit-todo'