CFRCPRAP-182: fixed radio Group
Merge branch 'r2.3.1' into develop