Merge "Remove fixed todo" into rvc-dev