Merge "Remove obsolete/infeasible TODOs" into rvc-dev