Merge "Fix broken test cast" into rvc-dev