Merge "Add support for setting Enums"