Merge "Fix broken test cases" into rvc-dev