Merge pull request #17008 from ivan-compucorp/CPS-70-fix-radio-value