Merge "Added todo work" into rvc-dev