Merge "Fix test case" into rvc-dev