CFRCPRAP-163,CFRCPRAP-164 correctly handle radio groups