Merge "Fix broken test" into rvc-dev