Improve Enum
serialization via AnnotatedClass
#3991
Merged
Enum
serialization via AnnotatedClass
#3991