[2.6] Updated TODO.yml
Merge remote-tracking branch 'origin/master'