Merge pull request #12229 from mattwire/optionvalue_fixes