Merge "CEC: Drop TODOs marked as fixed/obsolete"