Merge pull request #90386 from Snowy1803/salvage-enum-data