Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev