updating TODO
Merge branch 'master' into features/scheduler