Merge enums branch.