Merge "support legacy enumeration mapping"