Merge pull request #23016 from pradpnayak/optionValue