OC-6048
more fixes to commit regarding to repeating group