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