Merge branch 'es/rebase-i-count-todo'