Update TODO for recent changes
Merge branch 'master' into count-on-segview

* master:
  Update TODO for recent changes