Merge pull request #11633 from eileenmcnaughton/option_value