Make the format for Enum and String interchangeable. This results in smaller messages.
Merge remote-tracking branch 'origin/master'