Merge "Remove completed TODO" into rvc-dev