Removed done TODOs
Merge branch 'master' into debug