Merge "Add more tests for corner cases in role." into rvc-dev