Merge "Try to resolve IDs also as enums"