OC-6048
checking in more code for repeating group saving part