Added groupId to case groups
p4#: 21594