Merge pull request #7081 from yufeih/enum_try_parse