Merge "Fix failed test cases" into rvc-dev