Merge "Remove misleading comments" into rvc-dev