OC-6048
checking in more code regarding to repeating group