#7243 Updated the schema to be enum->string serialization-friendly.