Merge "Use safe_union in FieldSupportedValues"