Merge "Revert "Support enumerated property types in UC interface""