Merge "Fix group name layout" into rvc-dev