OC-6048
check in fixes for repeating group