Huge, misplaced todo update.
Merge branch 'master' into graph-split-wip