[[ Bug 11751 ]] Make sure the label of an option button is updated correctly on Mac.
Merge branch 'bugfix-11751' into release-6.5.3
Merge branch 'release-6.5.3' into develop