Merge "Remove a TODO as no work needs to be done" into rvc-dev