--- a/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Thu Mar 26 14:25:50 2020 +1100
+++ b/extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	Thu Mar 26 15:26:18 2020 +1100
@@ -811,281 +811,460 @@
 ,,,,,,,,
 @standard,3GPP TS 32.299,,,,,,,
 #=,,,,,,,,
-# 3GPP 32.299-b80 (11.8.0 2013-07),,,,,,,,
+# 3GPP TS 32.299 V15.7.0 (2019-06),,,,,,,,
+# From 3GPP 32299-f70.doc,,,,,,,,
+#=,,,,,,,,
+#,,,,,,,,
+#=,,,,,,,,
+# 3GPP TS 32.299 Table 7.2.0.1: 3GPP specific AVPs,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
-AF-Correlation-Information,1276,,Grouped,"M,V",P,,,N
-Access-Network-Information,1263,,OctetString,"M,V",P,,,N
-Access-Transfer-Information,2709,,Grouped,"M,V",P,,,N
-Access-Transfer-Type,2710,,Enumerated,"M,V",P,,,N
-Account-Expiration,2309,,Time,"M,V",P,,,N
-Accumulated-Cost,2052,,Grouped,"M,V",P,,,N
-Adaptations,1217,,Enumerated,"M,V",P,,,N
-Additional-Content-Information,1207,,Grouped,"M,V",P,,,N
-Additional-Type-Information,1205,,UTF8String,"M,V",P,,,N
-Address-Data,897,,UTF8String,"M,V",P,,,N
-Address-Domain,898,,Grouped,"M,V",P,,,N
-Address-Type,899,,Enumerated,"M,V",P,,,N
-Addressee-Type,1208,,Enumerated,"M,V",P,,,N
-Alternate-Charged-Party-Address,1280,,UTF8String,"M,V",P,,,N
-AoC-Cost-Information,2053,,Grouped,"M,V",P,,,N
-AoC-Format,2310,,Enumerated,"M,V",P,,,N
-AoC-Information,2054,,Grouped,"M,V",P,,,N
-AoC-Request-Type,2055,,Enumerated,"M,V",P,,,N
-AoC-Service,2311,,Grouped,"M,V",P,,,N
-AoC-Service-Obligatory-Type,2312,,Enumerated,"M,V",P,,,N
-AoC-Service-Type,2313,,Enumerated,"M,V",P,,,N
-AoC-Subscription-Information,2314,,Grouped,"M,V",P,,,N
-Applic-ID,1218,,UTF8String,"M,V",P,,,N
-Application-Server,836,,UTF8String,"M,V",P,,,N
-Application-Server-Information,850,,Grouped,"M,V",P,,,N
-Application-Provided-Called-Party-Address,837,,UTF8String,"M,V",P,,,N
-Associated-Party-Address,2035,,UTF8String,"M,V",P,,,N
-Associated-URI,856,,UTF8String,"M,V",P,,,N
-Aux-Applic-Info,1219,,UTF8String,"M,V",P,,,N
-Base-Time-Interval,1265,,Unsigned32,"M,V",P,,,N
-Bearer-Service,854,,OctetString,"M,V",P,,,N
-CG-Address,846,,Address,"M,V",P,,,Y
-CSG-Access-Mode,2317,,Enumerated,"M,V",P,,,N
-CSG-Membership-Indication,2318,,Enumerated,"M,V",P,,,N
-CUG-Information,2304,,OctetString,"M,V",P,,,N
-Called-Asserted-Identity,1250,,UTF8String,"M,V",P,,,N
-Called-Party-Address,832,,UTF8String,"M,V",P,,,N
-Calling-Party-Address,831,,UTF8String,"M,V",P,,,N
-Carrier-Select-Routing-Information,2023,,UTF8String,"M,V",P,,,N
-Cause-Code,861,,Integer32,"M,V",P,,,N
-Change-Condition,2037,,Integer32,"M,V",P,,,N
-Change-Time,2038,,Time,"M,V",P,,,N
-Charge-Reason-Code,2118,,Enumerated,"M,V",P,,,N
-Charged-Party,857,,UTF8String,"M,V",P,,,N
-Charging-Characteristics-Selection-Mode,2066,,Enumerated,"M,V",P,,,N
-Class-Identifier,1214,,Enumerated,"M,V",P,,,N
-Client-Address,2018,,Address,"M,V",P,,,N
-Content-Class,1220,,Enumerated,"M,V",P,,,N
-Content-Disposition,828,,UTF8String,"M,V",P,,,N
-Content-Length,827,,Unsigned32,"M,V",P,,,N
-Content-Size,1206,,Unsigned32,"M,V",P,,,N
-Content-Type,826,,UTF8String,"M,V",P,,,N
-Current-Tariff,2056,,Grouped,"M,V",P,,,N
-DRM-Content,1221,,Enumerated,"M,V",P,,,N
-Data-Coding-Scheme,2001,,Integer32,"M,V",P,,,N
-Deferred-Location-Event-Type,1230,,UTF8String,"M,V",P,,,N
-Delivery-Report-Requested,1216,,Enumerated,"M,V",P,,,N
-Destination-Interface,2002,,Grouped,"M,V",P,,,N
-Diagnostics,2039,,Integer32,"M,V",P,,,N
-Domain-Name,1200,,UTF8String,"M,V",P,,,N
-Dynamic-Address-Flag,2051,,Enumerated,"M,V",P,,,N
-Dynamic-Address-Flag-Extension,2068,,Enumerated,"M,V",P,,,N
-Early-Media-Description,1272,,Grouped,"M,V",P,,,N
-Envelope,1266,,Grouped,"M,V",P,,,N
-Envelope-End-Time,1267,,Time,"M,V",P,,,N
-Envelope-Reporting,1268,,Enumerated,"M,V",P,,,N
-Envelope-Start-Time,1269,,Time,"M,V",P,,,N
-Event,825,,UTF8String,"M,V",P,,,N
-Event-Charging-TimeStamp,1258,,Time,"M,V",P,,,N
-Event-Type,823,,Grouped,"M,V",P,,,N
-Expires,888,,Unsigned32,"M,V",P,,,N
-File-Repair-Supported,1224,,Enumerated,"M,V",P,,,Y
-From-Address,2708,,UTF8String,"M,V",P,,,N
-GGSN-Address,847,,Address,"M,V",P,,,N
-IMS-Application-Reference-Identifier,2601,,UTF8String,"M,V",P,,,N
-IMS-Charging-Identifier,841,,UTF8String,"M,V",P,,,N
-IMS-Communication-Service-Identifier,1281,,UTF8String,"M,V",P,,,N
-IMS-Emergency-Indicator,2322,,Enumerated,"M,V",P,,,N
-IMS-Information,876,,Grouped,"M,V",P,,,N
-IMSI-Unauthenticated-Flag,2308,,Enumerated,"M,V",P,,,N
-IP-Realm-Default-Indication,2603,,Enumerated,"M,V",P,,,N
-Incoming-Trunk-Group-Id,852,,UTF8String,"M,V",P,,,N
-Incremental-Cost,2062,,Grouped,"M,V",P,,,N
-Initial-IMS-Charging-Identifier,2321,,UTF8String,"M,V",P,,,N
-Inter-Operator-Identifier,838,,Grouped,"M,V",P,,,N
-Interface-Id,2003,,UTF8String,"M,V",P,,,N
-Interface-Port,2004,,UTF8String,"M,V",P,,,N
-Interface-Text,2005,,UTF8String,"M,V",P,,,N
-Interface-Type,2006,,Enumerated,"M,V",P,,,N
-LCS-APN,1231,,UTF8String,"M,V",P,,,N
-LCS-Client-Dialed-By-MS,1233,,UTF8String,"M,V",P,,,N
-LCS-Client-External-ID,1234,,UTF8String,"M,V",P,,,N
-LCS-Client-Id,1232,,Grouped,"M,V",P,,,N
-LCS-Client-Name,1235,,Grouped,"M,V",P,,,N
-LCS-Client-Type,1241,,Enumerated,"M,V",P,,,N
-LCS-Data-Coding-Scheme,1236,,UTF8String,"M,V",P,,,N
-LCS-Format-Indicator,1237,,Enumerated,"M,V",P,,,N
-LCS-Information,878,,Grouped,"M,V",P,,,N
-LCS-Name-String,1238,,UTF8String,"M,V",P,,,N
-LCS-Requestor-Id,1239,,Grouped,"M,V",P,,,N
-LCS-Requestor-Id-String,1240,,UTF8String,"M,V",P,,,N
-Local-GW-Inserted-Indication,2604,,Enumerated,"M,V",P,,,N
-Local-Sequence-Number,2063,,Unsigned32,"M,V",P,,,N
-Location-Estimate,1242,,OctetString,"M,V",P,,,N
-Location-Estimate-Type,1243,,Enumerated,"M,V",P,,,N
-Location-Type,1244,,Grouped,"M,V",P,,,N
-Low-Balance-Indication,2020,,Enumerated,"M,V",P,,,N
-Low-Priority-Indicator,2602,,Enumerated,"M,V",P,,,N
+3GPP-OC-Specific-Reduction,1320,,Grouped,V,,,M
+3GPP-OC-Rating-Group,1321,,Unsigned32,V,,,M
+3GPP-OC-Request-Type,1322,,Enumerated,V,,,M
+# Note: Name conflict with 3GPP TS 29.212 3GPP-PS-Data-Off-Status (2847).,,,,,,,,
+3GPP-PS-Data-Off-Status-32.299,4406,,Enumerated,"V,M",,,
+Access-Network-Info-Change,4401,,Grouped,"V,M",,,
+Access-Network-Information,1263,,OctetString,"V,M",,,
+Access-Transfer-Information,2709,,Grouped,"V,M",,,
+Access-Transfer-Type,2710,,Enumerated,"V,M",,,
+Account-Expiration,2309,,Time,"V,M",,,
+Accumulated-Cost,2052,,Grouped,"V,M",,,
+Adaptations,1217,,Enumerated,"V,M",,,
+Additional-Content-Information,1207,,Grouped,"V,M",,,
+Additional-Exception-Reports,3936,,Enumerated,"V,M",,,
+Additional-Type-Information,1205,,UTF8String,"V,M",,,
+Address-Data,897,,UTF8String,"V,M",,,
+Address-Domain,898,,Grouped,"V,M",,,
+Addressee-Type,1208,,Enumerated,"V,M",,,
+Address-Type,899,,Enumerated,"V,M",,,
+AF-Correlation-Information,1276,,Grouped,"V,M",,,
+Alternate-Charged-Party-Address,1280,,UTF8String,"V,M",,,
+Announcement-Identifier,3905,,Unsigned32,"V,M",,,
+Announcement-Information,3904,,Grouped,"V,M",,,
+Announcement-Order,3906,,Unsigned32,"V,M",,,
+Announcing-PLMN-ID,4408,,UTF8String,"V,M",,,
+Announcing-UE-HPLMN-Identifier,3426,,UTF8String,"V,M",,,
+Announcing-UE-VPLMN-Identifier,3427,,UTF8String,"V,M",,,
+AoC-Cost-Information,2053,,Grouped,"V,M",,,
+AoC-Format,2310,,Enumerated,"V,M",,,
+AoC-Information,2054,,Grouped,"V,M",,,
+AoC-Request-Type,2055,,Enumerated,"V,M",,,
+AoC-Service,2311,,Grouped,"V,M",,,
+AoC-Service-Obligatory-Type,2312,,Enumerated,"V,M",,,
+AoC-Service-Type,2313,,Enumerated,"V,M",,,
+AoC-Subscription-Information,2314,,Grouped,"V,M",,,
+API-Content,1309,,UTF8String,V,,,M
+API-Direction,1310,,Enumerated,V,,,M
+API-Identifier,1311,,OctetString,V,,,M
+API-Invocation-Timestamp,1312,,Time,V,,,M
+API-Network-Service-Node,1315,,Enumerated,V,,,M
+API-Result-Code,1313,,Unsigned32,V,,,M
+API-Size,1314,,Unsigned64,V,,,M
+APN-Rate-Control,3933,,Grouped,"V,M",,,
+APN-Rate-Control-Downlink,3934,,Grouped,"V,M",,,
+APN-Rate-Control-Uplink,3935,,Grouped,"V,M",,,
+Applic-ID,1218,,UTF8String,"V,M",,,
+Application-Provided-Called-Party-Address,837,,UTF8String,"V,M",,,
+Application-Server,836,,UTF8String,"V,M",,,
+Application-Server-Information,850,,Grouped,"V,M",,,
+Application-Specific-Data,3458,,OctetString,"V,M",,,
+Associated-Party-Address,2035,,UTF8String,"V,M",,,
+Associated-URI,856,,UTF8String,"V,M",,,
+Authorised-QoS,849,,UTF8String,"V,M",,,
+Aux-Applic-Info,1219,,UTF8String,"V,M",,,
+Base-Time-Interval,1265,,Unsigned32,"V,M",,,
+Basic-Service-Code,3411,,Grouped,"V,M",,,
+Bearer-Capability,3412,,OctetString,"V,M",,,
+Bearer-Service,854,,OctetString,"V,M",,,
+BSSID,2716,,UTF8String,"V,M",,,
+Called-Asserted-Identity,1250,,UTF8String,"V,M",,,
+Called-Identity,3916,,UTF8String,"V,M",,,
+Called-Identity-Change,3917,,Grouped,"V,M",,,
+Called-Party-Address,832,,UTF8String,"V,M",,,
+Calling-Party-Address,831,,UTF8String,"V,M",,,
+Carrier-Select-Routing-Information,2023,,UTF8String,"V,M",,,
+Cause-Code,861,,Integer32,"V,M",,,
+Cellular-Network-Information,3924,,OctetString,"V,M",,,
+CG-Address,846,,Address,"V,M",,,
+Change-Condition,2037,,Integer32,"V,M",,,
+Change-Time,2038,,Time,"V,M",,,
+Charge-Reason-Code,2118,,Enumerated,"V,M",,,
+Charged-Party,857,,UTF8String,"V,M",,,
+Charging-Characteristics-Selection-Mode,2066,,Enumerated,"V,M",,,
+Charging-Per-IP-CAN-Session-Indicator,4400,,Enumerated,"V,M",,,
+Civic-Address-Information,1305,,UTF8String,V,,,M
+Class-Identifier,1214,,Enumerated,"V,M",,,
+Client-Address,2018,,Address,"V,M",,,
+CN-Operator-Selection-Entity,3421,,Enumerated,"V,M",,,
+Content-Class,1220,,Enumerated,"V,M",,,
+Content-Disposition,828,,UTF8String,"V,M",,,
+Content-Length,827,,Unsigned32,"V,M",,,
+Content-Size,1206,,Unsigned32,"V,M",,,
+Content-Type,826,,UTF8String,"V,M",,,
+Coverage-Info,3459,,Grouped,"V,M",,,
+Coverage-Status,3428,,Enumerated,"V,M",,,
+CP-CIoT-EPS-Optimisation-Indicator,3930,,Enumerated,"V,M",,,
+CPDT-Information,3927,,Grouped,"V,M",,,
+CSG-Access-Mode,2317,,Enumerated,"V,M",,,
+CSG-Membership-Indication,2318,,Enumerated,"V,M",,,
+CUG-Information,2304,,OctetString,"V,M",,,
+Current-Tariff,2056,,Grouped,"V,M",,,
+Data-Coding-Scheme,2001,,Integer32,"V,M",,,
+Deferred-Location-Event-Type,1230,,UTF8String,"V,M",,,
+Delivery-Report-Requested,1216,,Enumerated,"V,M",,,
+Destination-Interface,2002,,Grouped,"V,M",,,
+Diagnostics,2039,,Integer32,"V,M",,,
+Discoveree-UE-HPLMN-Identifier,4402,,UTF8String,"V,M",,,
+Discoveree-UE-VPLMN-Identifier,4403,,UTF8String,"V,M",,,
+Discoverer-UE-HPLMN-Identifier,4404,,UTF8String,"V,M",,,
+Discoverer-UE-VPLMN-Identifier,4405,,UTF8String,"V,M",,,
+Domain-Name,1200,,UTF8String,"V,M",,,
+DRM-Content,1221,,Enumerated,"V,M",,,
+Dynamic-Address-Flag,2051,,Enumerated,"V,M",,,
+Dynamic-Address-Flag-Extension,2068,,Enumerated,"V,M",,,
+Early-Media-Description,1272,,Grouped,"V,M",,,
+Enhanced-Diagnostics,3901,,Grouped,"V,M",,,
+Envelope,1266,,Grouped,"V,M",,,
+Envelope-End-Time,1267,,Time,"V,M",,,
+Envelope-Reporting,1268,,Enumerated,"V,M",,,
+Envelope-Start-Time,1269,,Time,"V,M",,,
+EPDG-Address,3425,,Address,"V,M",,,
+Event,825,,UTF8String,"V,M",,,
+Event-Charging-TimeStamp,1258,,Time,"V,M",,,
+Event-Type,823,,Grouped,"V,M",,,
+Expires,888,,Unsigned32,"V,M",,,
+Exposure-Function-API-Information,1316,,Grouped,V,,,M
+FE-Identifier-List,4413,,UTF8String,"V,M",,,
+File-Repair-Supported,1224,,Enumerated,"V,M",,,
+Forwarding-Pending,3415,,Enumerated,"V,M",,,
+From-Address,2708,,UTF8String,"V,M",,,
+GGSN-Address,847,,Address,"V,M",,,
+IMS-Application-Reference-Identifier,2601,,UTF8String,"V,M",,,
+IMS-Charging-Identifier,841,,UTF8String,"V,M",,,
+IMS-Communication-Service-Identifier,1281,,UTF8String,"V,M",,,
+IMS-Emergency-Indicator,2322,,Enumerated,"V,M",,,
+IMS-Information,876,,Grouped,"V,M",,,
+IMS-Visited-Network-Identifier,2713,,UTF8String,"V,M",,,
+IMSI-Unauthenticated-Flag,2308,,Enumerated,"V,M",,,
+Incoming-Trunk-Group-Id,852,,UTF8String,"V,M",,,
+Incremental-Cost,2062,,Grouped,"V,M",,,
+Initial-IMS-Charging-Identifier,2321,,UTF8String,"V,M",,,
+Instance-Id,3402,,UTF8String,"V,M",,,
+Interface-Id,2003,,UTF8String,"V,M",,,
+Interface-Port,2004,,UTF8String,"V,M",,,
+Interface-Text,2005,,UTF8String,"V,M",,,
+Interface-Type,2006,,Enumerated,"V,M",,,
+Inter-Operator-Identifier,838,,Grouped,"V,M",,,
+Inter-UE-Transfer,3902,,Enumerated,"V,M",,,
+IP-Realm-Default-Indication,2603,,Enumerated,"V,M",,,
+ISUP-Cause,3416,,Grouped,"V,M",,,
+ISUP-Cause-Diagnostics,3422,,OctetString,"V,M",,,
+ISUP-Cause-Location,3423,,Unsigned32,"V,M",,,
+ISUP-Cause-Value,3424,,Unsigned32,"V,M",,,
+ISUP-Location-Number,3414,,OctetString,"V,M",,,
+Language,3914,,UTF8String,"V,M",,,
+Layer-2-Group-ID,3429,,OctetString,"V,M",,,
+LCS-APN,1231,,UTF8String,"V,M",,,
+LCS-Client-Dialed-By-MS,1233,,UTF8String,"V,M",,,
+LCS-Client-External-ID,1234,,UTF8String,"V,M",,,
+LCS-Client-Id,1232,,Grouped,"V,M",,,
+LCS-Client-Name,1235,,Grouped,"V,M",,,
+LCS-Client-Type,1241,,Enumerated,"V,M",,,
+LCS-Data-Coding-Scheme,1236,,UTF8String,"V,M",,,
+LCS-Format-Indicator,1237,,Enumerated,"V,M",,,
+LCS-Information,878,,Grouped,"V,M",,,
+LCS-Name-String,1238,,UTF8String,"V,M",,,
+# Note: 3GPP TS 32.299 V11.8.0 (2013-07) renamed,,,,,,,,
+# LCS-Requestor-Id (1239) to LCS-Requestor-ID (1239).,,,,,,,,
+LCS-Requestor-ID,1239,,Grouped,"V,M",,,
+# Note: 3GPP TS 32.299 V11.8.0 (2013-07) renamed,,,,,,,,
+# LCS-Requestor-Id-String (1240) to LCS-Requestor-ID-String (1240).,,,,,,,,
+LCS-Requestor-ID-String,1240,,UTF8String,"V,M",,,
+Local-GW-Inserted-Indication,2604,,Enumerated,"V,M",,,
+Local-Sequence-Number,2063,,Unsigned32,"V,M",,,
+Location-Estimate,1242,,OctetString,"V,M",,,
+Location-Estimate-Type,1243,,Enumerated,"V,M",,,
+Location-Info,3460,,Grouped,"V,M",,,
+Location-Type,1244,,Grouped,"V,M",,,
+Low-Balance-Indication,2020,,Enumerated,"V,M",,,
+Low-Priority-Indicator,2602,,Enumerated,"V,M",,,
+MBMS-Charged-Party,2323,,Enumerated,"V,M",,,
 # Note: 3GPP TS 32.299 V11.8.0 (2013-07) table 7.2 changed,,,,,,,,
 # row MBMS-GW-Address (2307) to have a hyphen instead of space.,,,,,,,,
 # Generated name renamed from MBMSGW-Address (2307).,,,,,,,,
-MBMS-GW-Address,2307,,Address,"M,V",P,,,N
-MBMS-Information,880,,Grouped,"M,V",P,,,N
-MBMS-User-Service-Type,1225,,Enumerated,"M,V",P,,,Y
-MM-Content-Type,1203,,Grouped,"M,V",P,,,N
-MMBox-Storage-Requested,1248,,Enumerated,"M,V",P,,,N
-MMS-Information,877,,Grouped,"M,V",P,,,N
-MMTel-Information,2030,,Grouped,"M,V",P,,,N
-MMTel-SService-Type,2031,,Unsigned32,"M,V",P,,,N
-Media-Initiator-Flag,882,,Enumerated,"M,V",P,,,N
-Media-Initiator-Party,1288,,UTF8String,"M,V",P,,,N
-Message-Body,889,,Grouped,"M,V",P,,,N
-Message-Class,1213,,Grouped,"M,V",P,,,N
-Message-ID,1210,,UTF8String,"M,V",P,,,N
-Message-Size,1212,,Unsigned32,"M,V",P,,,N
-Message-Type,1211,,Enumerated,"M,V",P,,,N
-NNI-Information,2703,,Grouped,"M,V",P,,,N
-NNI-Type,2704,,Enumerated,"M,V",P,,,N
-Neighbour-Node-Address,2705,,Address,"M,V",P,,,N
-Next-Tariff,2057,,Grouped,"M,V",P,,,N
-Node-Functionality,862,,Enumerated,"M,V",P,,,N
-Node-Id,2064,,UTF8String,"M,V",P,,,N
-Number-Of-Diversions,2034,,Unsigned32,"M,V",P,,,N
-Number-Of-Messages-Sent,2019,,Unsigned32,"M,V",P,,,N
-Number-Of-Participants,885,,Unsigned32,"M,V",P,,,N
-Number-Of-Received-Talk-Bursts,1282,,Unsigned32,"M,V",P,,,N
-Number-Of-Talk-Bursts,1283,,Unsigned32,"M,V",P,,,N
-Number-Portability-Routing-Information,2024,,UTF8String,"M,V",P,,,N
-Offline-Charging,1278,,Grouped,"M,V",P,,,N
-Online-Charging-Flag,2303,,Enumerated,"M,V",P,,,N
-Originating-IOI,839,,UTF8String,"M,V",P,,,N
-Originator,864,,Enumerated,"M,V",P,,,N
-Originator-Address,886,,Grouped,"M,V",P,,,N
-Originator-Interface,2009,,Grouped,"M,V",P,,,N
-Originator-Received-Address,2027,,Grouped,"M,V",P,,,N
-Originator-SCCP-Address,2008,,Address,"M,V",P,,,N
-Outgoing-Session-Id,2320,,UTF8String,"M,V",P,,,N
-Outgoing-Trunk-Group-Id,853,,UTF8String,"M,V",P,,,N
+MBMS-GW-Address,2307,,Address,"V,M",,,
+MBMS-Information,880,,Grouped,"V,M",,,
+MBMS-User-Service-Type,1225,,Enumerated,"V,M",,,
+Media-Initiator-Flag,882,,Enumerated,"V,M",,,
+Media-Initiator-Party,1288,,UTF8String,"V,M",,,
+Message-Body,889,,Grouped,"V,M",,,
+Message-Class,1213,,Grouped,"V,M",,,
+Message-ID,1210,,UTF8String,"V,M",,,
+Message-Size,1212,,Unsigned32,"V,M",,,
+Message-Type,1211,,Enumerated,"V,M",,,
+MMBox-Storage-Requested,1248,,Enumerated,"V,M",,,
+MM-Content-Type,1203,,Grouped,"V,M",,,
+MMS-Information,877,,Grouped,"V,M",,,
+MMTel-Information,2030,,Grouped,"V,M",,,
+MMTel-SService-Type,2031,,Unsigned32,"V,M",,,
+Monitored-PLMN-Identifier,3430,,UTF8String,"V,M",,,
+Monitoring-Event-Configuration-Activity,3919,,Integer32,"V,M",,,
+Monitoring-Event-Functionality,3922,,Integer32,"V,M",,,
+Monitoring-Event-Information,3921,,Grouped,"V,M",,,
+Monitoring-Event-Report-Data,3920,,Grouped,"V,M",,,
+Monitoring-Event-Report-Number,3923,,Unsigned32,"V,M",,,
+Monitoring-UE-HPLMN-Identifier,3431,,UTF8String,"V,M",,,
+Monitoring-UE-Identifier,3432,,UTF8String,"V,M",,,
+Monitoring-UE-VPLMN-Identifier,3433,,UTF8String,"V,M",,,
+MSC-Address,3417,,OctetString,"V,M",,,
+MTC-IWF-Address,3406,,Address,"V,M",,,
+Neighbour-Node-Address,2705,,Address,"V,M",,,
+Network-Call-Reference-Number,3418,,OctetString,"V,M",,,
+Next-Tariff,2057,,Grouped,"V,M",,,
+NIDD-Submission,3928,,Grouped,"V,M",,,
+NNI-Information,2703,,Grouped,"V,M",,,
+NNI-Type,2704,,Enumerated,"V,M",,,
+Node-Functionality,862,,Enumerated,"V,M",,,
+Node-Id,2064,,UTF8String,"V,M",,,
+Number-Of-Diversions,2034,,Unsigned32,"V,M",,,
+Number-Of-Messages-Sent,2019,,Unsigned32,"V,M",,,
+Number-Of-Participants,885,,Unsigned32,"V,M",,,
+Number-Of-Received-Talk-Bursts,1282,,Unsigned32,"V,M",,,
+Number-Of-Talk-Bursts,1283,,Unsigned32,"V,M",,,
+Number-Portability-Routing-Information,2024,,UTF8String,"V,M",,,
+Offline-Charging,1278,,Grouped,"V,M",,,
+Online-Charging-Flag,2303,,Enumerated,"V,M",,,
+Originating-IOI,839,,UTF8String,"V,M",,,
+Originator,864,,Enumerated,"V,M",,,
+Originator-Address,886,,Grouped,"V,M",,,
+Originator-Interface,2009,,Grouped,"V,M",,,
+Originator-Received-Address,2027,,Grouped,"V,M",,,
+Originator-SCCP-Address,2008,,Address,"V,M",,,
+Outgoing-Session-Id,2320,,UTF8String,"V,M",,,
+Outgoing-Trunk-Group-Id,853,,UTF8String,"V,M",,,
+Participant-Access-Priority,1259,,Enumerated,"V,M",,,
+Participant-Action-Type,2049,,Enumerated,"V,M",,,
+Participant-Group,1260,,Grouped,"V,M",,,
+Participants-Involved,887,,UTF8String,"V,M",,,
+PC3-Control-Protocol-Cause,3434,,Integer32,"V,M",,,
+PC3-EPC-Control-Protocol-Cause,3435,,Integer32,"V,M",,,
+PC5-Radio-Technology,1300,,Enumerated,V,,,M
+PDN-Connection-Charging-ID,2050,,Unsigned32,"V,M",,,
+PDP-Address,1227,,Address,"V,M",,,
+PDP-Address-Prefix-Length,2606,,Unsigned32,"V,M",,,
+PDP-Context-Type,1247,,Enumerated,"V,M",,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Address (895).,,,,,,,,
 PDG-Address,895,,Address,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Charging-Id (896).,,,,,,,,
 PDG-Charging-Id,896,,Unsigned32,"M,V",P,,,N
-PDN-Connection-Charging-ID,2050,,Unsigned32,"M,V",P,,,N
-PDP-Address,1227,,Address,"M,V",P,,,Y
-PDP-Address-Prefix-Length,2606,,Unsigned32,"M,V",P,,,Y
-PDP-Context-Type,1247,,Enumerated,"M,V",P,,,N
-PS-Append-Free-Format-Data,867,,Enumerated,"M,V",P,,,N
-PS-Free-Format-Data,866,,OctetString,"M,V",P,,,N
-PS-Furnish-Charging-Information,865,,Grouped,"M,V",P,,,N
-PS-Information,874,,Grouped,"M,V",P,,,N
-Participant-Access-Priority,1259,,Enumerated,"M,V",P,,,N
-Participant-Action-Type,2049,,Enumerated,"M,V",P,,,N
-Participant-Group,1260,,Grouped,"M,V",P,,,N
-Participants-Involved,887,,UTF8String,"M,V",P,,,N
-PoC-Change-Condition,1261,,Enumerated,"M,V",P,,,N
-PoC-Change-Time,1262,,Time,"M,V",P,,,N
-PoC-Controlling-Address,858,,UTF8String,"M,V",P,,,N
-PoC-Event-Type,2025,,Enumerated,"M,V",P,,,N
-PoC-Group-Name,859,,UTF8String,"M,V",P,,,N
-PoC-Information,879,,Grouped,"M,V",P,,,N
-PoC-Server-Role,883,,Enumerated,"M,V",P,,,N
-PoC-Session-Id,1229,,UTF8String,"M,V",P,,,N
-PoC-Session-Initiation-type,1277,,Enumerated,"M,V",P,,,N
-PoC-Session-Type,884,,Enumerated,"M,V",P,,,N
-PoC-User-Role,1252,,Grouped,"M,V",P,,,N
-PoC-User-Role-IDs,1253,,UTF8String,"M,V",P,,,N
-PoC-User-Role-info-Units,1254,,Enumerated,"M,V",P,,,N
-Positioning-Data,1245,,UTF8String,"M,V",P,,,N
-Preferred-AoC-Currency,2315,,Unsigned32,"M,V",P,,,N
-Priority,1209,,Enumerated,"M,V",P,,,N
-Quota-Consumption-Time,881,,Unsigned32,"M,V",P,,,N
-Quota-Holding-Time,871,,Unsigned32,"M,V",P,,,N
-Rate-Element,2058,,Grouped,"M,V",P,,,N
-Read-Reply-Report-Requested,1222,,Enumerated,"M,V",P,,,N
-Real-Time-Tariff-Information,2305,,Grouped,"M,V",P,,,N
-Received-Talk-Burst-Time,1284,,Unsigned32,"M,V",P,,,N
-Received-Talk-Burst-Volume,1285,,Unsigned32,"M,V",P,,,N
-Recipient-Address,1201,,Grouped,"M,V",P,,,N
-Recipient-Info,2026,,Grouped,"M,V",P,,,N
-Recipient-Received-Address,2028,,Grouped,"M,V",P,,,N
-Recipient-SCCP-Address,2010,,Address,"M,V",P,,,N
-Refund-Information,2022,,OctetString,"M,V",P,,,N
-Relationship-Mode,2706,,Enumerated,"M,V",P,,,N
-Remaining-Balance,2021,,Grouped,"M,V",P,,,N
-Reply-Applic-ID,1223,,UTF8String,"M,V",P,,,N
-Reply-Path-Requested,2011,,Enumerated,"M,V",P,,,N
-Reporting-Reason,872,,Enumerated,"M,V",P,,,N
-Requested-Party-Address,1251,,UTF8String,"M,V",P,,,N
-Role-Of-Node,829,,Enumerated,"M,V",P,,,N
-SDP-Answer-Timestamp,1275,,Time,"M,V",P,,,N
-SDP-Media-Component,843,,Grouped,"M,V",P,,,N
-SDP-Media-Description,845,,UTF8String,"M,V",P,,,N
-SDP-Media-Name,844,,UTF8String,"M,V",P,,,N
-SDP-Offer-Timestamp,1274,,Time,"M,V",P,,,N
-SDP-Session-Description,842,,UTF8String,"M,V",P,,,N
-SDP-TimeStamps,1273,,Grouped,"M,V",P,,,N
-SDP-Type,2036,,Enumerated,"M,V",P,,,N
-SGSN-Address,1228,,Address,"M,V",P,,,N
-SGW-Address,2067,,Address,"M,V",P,,,N
-SGW-Change,2065,,Enumerated,"M,V",P,,,N
-SIP-Method,824,,UTF8String,"M,V",P,,,N
-SIP-Request-Timestamp,834,,Time,"M,V",P,,,N
-SIP-Request-Timestamp-Fraction,2301,,Unsigned32,"M,V",P,,,N
-SIP-Response-Timestamp,835,,Time,"M,V",P,,,N
-SIP-Response-Timestamp-Fraction,2302,,Unsigned32,"M,V",P,,,N
-SM-Discharge-Time,2012,,Time,"M,V",P,,,N
-SM-Message-Type,2007,,Enumerated,"M,V",P,,,N
-SM-Protocol-ID,2013,,OctetString,"M,V",P,,,N
-SM-Service-Type,2029,,Enumerated,"M,V",P,,,N
-SM-Status,2014,,OctetString,"M,V",P,,,N
-SM-User-Data-Header,2015,,OctetString,"M,V",P,,,N
-SMS-Information,2000,,Grouped,"M,V",P,,,N
-SMS-Node,2016,,Enumerated,"M,V",P,,,N
-SMSC-Address,2017,,Address,"M,V",P,,,N
-Scale-Factor,2059,,Grouped,"M,V",P,,,N
-Served-Party-IP-Address,848,,Address,"M,V",P,,,N
-Service-Data-Container,2040,,Grouped,"M,V",P,,,N
-Service-Id,855,,UTF8String,"M,V",P,,,N
-Service-Information,873,,Grouped,"M,V",P,,,N
-Service-Mode,2032,,Unsigned32,"M,V",P,,,N
-Service-Specific-Data,863,,UTF8String,"M,V",P,,,N
-Service-Specific-Info,1249,,Grouped,"M,V",P,,,N
-Service-Specific-Type,1257,,Unsigned32,"M,V",P,,,N
-Serving-Node-Type,2047,,Enumerated,"M,V",P,,,N
-Session-Direction,2707,,Enumerated,"M,V",P,,,N
-Start-Time,2041,,Time,"M,V",P,,,N
-Status,2702,,Enumerated,"M,V",P,,,N
-Stop-Time,2042,,Time,"M,V",P,,,N
-Submission-Time,1202,,Time,"M,V",P,,,N
-Subscriber-Role,2033,,Enumerated,"M,V",P,,,N
-Supplementary-Service,2048,,Grouped,"M,V",P,,,N
-Talk-Burst-Exchange,1255,,Grouped,"M,V",P,,,N
-Talk-Burst-Time,1286,,Unsigned32,"M,V",P,,,N
-Talk-Burst-Volume,1287,,Unsigned32,"M,V",P,,,N
-Tariff-Information,2060,,Grouped,"M,V",P,,,N
-Tariff-XML,2306,,UTF8String,"M,V",P,,,N
-Terminating-IOI,840,,UTF8String,"M,V",P,,,N
-Time-First-Usage,2043,,Time,"M,V",P,,,N
-Time-Last-Usage,2044,,Time,"M,V",P,,,N
-Time-Quota-Mechanism,1270,,Grouped,"M,V",P,,,N
-Time-Quota-Threshold,868,,Unsigned32,"M,V",P,,,N
-Time-Quota-Type,1271,,Enumerated,"M,V",P,,,N
-Time-Stamps,833,,Grouped,"M,V",P,,,N
-Time-Usage,2045,,Unsigned32,"M,V",P,,,N
-Token-Text,1215,,UTF8String,"M,V",P,,,N
-Traffic-Data-Volumes,2046,,Grouped,"M,V",P,,,N
-Transcoder-Inserted-Indication,2605,,Enumerated,"M,V",P,,,N
-Transit-IOI-List,2701,,UTF8String,"M,V",P,,,N
-Trigger,1264,,Grouped,"M,V",P,,,N
-Trigger-Type,870,,Enumerated,"M,V",P,,,N
-Trunk-Group-Id,851,,Grouped,"M,V",P,,,N
-Type-Number,1204,,Enumerated,"M,V",P,,,N
-Unit-Cost,2061,,Grouped,"M,V",P,,,N
-Unit-Quota-Threshold,1226,,Unsigned32,"M,V",P,,,N
-User-CSG-Information,2319,,Grouped,"M,V",P,,,N
-User-Participating-Type,1279,,Enumerated,"M,V",P,,,N
-User-Session-Id,830,,UTF8String,"M,V",P,,,N
-Volume-Quota-Threshold,869,,Unsigned32,"M,V",P,,,N
+Play-Alternative,3913,,Enumerated,"V,M",,,
+PoC-Change-Condition,1261,,Enumerated,"V,M",,,
+PoC-Change-Time,1262,,Time,"V,M",,,
+PoC-Controlling-Address,858,,UTF8String,"V,M",,,
+PoC-Event-Type,2025,,Enumerated,"V,M",,,
+PoC-Group-Name,859,,UTF8String,"V,M",,,
+PoC-Information,879,,Grouped,"V,M",,,
+PoC-Server-Role,883,,Enumerated,"V,M",,,
+PoC-Session-Id,1229,,UTF8String,"V,M",,,
+PoC-Session-Initiation-type,1277,,Enumerated,"V,M",,,
+PoC-Session-Type,884,,Enumerated,"V,M",,,
+PoC-User-Role,1252,,Grouped,"V,M",,,
+PoC-User-Role-IDs,1253,,UTF8String,"V,M",,,
+# Note: 3GPP TS 32.299 V13.1.0 (2015-06) renamed,,,,,,,,
+# PoC-User-Role-info-Units (1254) to PoC-User-Role-Info-Units (1254).,,,,,,,,
+PoC-User-Role-Info-Units,1254,,Enumerated,"V,M",,,
+Positioning-Data,1245,,UTF8String,"V,M",,,
+Preferred-AoC-Currency,2315,,Unsigned32,"V,M",,,
+Priority,1209,,Enumerated,"V,M",,,
+Privacy-Indicator,3915,,Enumerated,"V,M",,,
+ProSe-3rd-Party-Application-ID,3440,,UTF8String,"V,M",,,
+ProSe-Direct-Communication-Reception-Data-Container,3461,,Grouped,"V,M",,,
+ProSe-Direct-Communication-Transmission-Data-Container,3441,,Grouped,"V,M",,,
+ProSe-Direct-Discovery-Model,3442,,Enumerated,"V,M",,,
+ProSe-Event-Type,3443,,Enumerated,"V,M",,,
+ProSe-Function-IP-Address,3444,,Address,"V,M",,,
+ProSe-Function-PLMN-Identifier,3457,,UTF8String,"V,M",,,
+ProSe-Functionality,3445,,Enumerated,"V,M",,,
+ProSe-Group-IP-Multicast-Address,3446,,Address,"V,M",,,
+ProSe-Information,3447,,Grouped,"V,M",,,
+ProSe-Range-Class,3448,,Enumerated,"V,M",,,
+ProSe-Reason-For-Cancellation,3449,,Enumerated,"V,M",,,
+ProSe-Request-Timestamp,3450,,Time,"V,M",,,
+ProSe-Role-Of-UE,3451,,Enumerated,"V,M",,,
+ProSe-Source-IP-Address,3452,,Address,"V,M",,,
+ProSe-Target-Layer-2-ID,4410,,OctetString,"V,M",,,
+ProSe-UE-ID,3453,,OctetString,"V,M",,,
+ProSe-UE-to-Network-Relay-UE-ID,4409,,OctetString,"V,M",,,
+Proximity-Alert-Indication,3454,,Enumerated,"V,M",,,
+Proximity-Alert-Timestamp,3455,,Time,"V,M",,,
+Proximity-Cancellation-Timestamp,3456,,Time,"V,M",,,
+PS-Append-Free-Format-Data,867,,Enumerated,"V,M",,,
+PS-Free-Format-Data,866,,OctetString,"V,M",,,
+PS-Furnish-Charging-Information,865,,Grouped,"V,M",,,
+PS-Information,874,,Grouped,"V,M",,,
+Quota-Consumption-Time,881,,Unsigned32,"V,M",,,
+Quota-Holding-Time,871,,Unsigned32,"V,M",,,
+Quota-Indicator,3912,,Enumerated,"V,M",,,
+Radio-Frequency,3462,,OctetString,"V,M",,,
+Radio-Parameter-Set-Info,3463,,Grouped,"V,M",,,
+Radio-Parameter-Set-Values,3464,,OctetString,"V,M",,,
+Radio-Resources-Indicator,3465,,Integer32,"V,M",,,
+RAN-End-Time,1301,,Time,V,,,M
+RAN-Secondary-RAT-Usage-Report,1302,,Grouped,V,,,M
+RAN-Start-Time,1303,,Time,V,,,M
+Rate-Control-Max-Message-Size,3937,,Unsigned32,"V,M",,,
+Rate-Control-Max-Rate,3938,,Unsigned32,"V,M",,,
+Rate-Control-Time-Unit,3939,,Unsigned32,"V,M",,,
+Rate-Element,2058,,Grouped,"V,M",,,
+Read-Reply-Report-Requested,1222,,Enumerated,"V,M",,,
+Real-Time-Tariff-Information,2305,,Grouped,"V,M",,,
+Reason-Header,3401,,UTF8String,"V,M",,,
+Received-Talk-Burst-Time,1284,,Unsigned32,"V,M",,,
+Received-Talk-Burst-Volume,1285,,Unsigned32,"V,M",,,
+Recipient-Address,1201,,Grouped,"V,M",,,
+Recipient-Info,2026,,Grouped,"V,M",,,
+Recipient-Received-Address,2028,,Grouped,"V,M",,,
+Recipient-SCCP-Address,2010,,Address,"V,M",,,
+Refund-Information,2022,,OctetString,"V,M",,,
+Related-Change-Condition-Information,3925,,Grouped,"V,M",,,
+Related-Trigger,3926,,Grouped,"V,M",,,
+Related-IMS-Charging-Identifier,2711,,UTF8String,"V,M",,,
+Related-IMS-Charging-Identifier-Node,2712,,Address,"V,M",,,
+Relationship-Mode,2706,,Enumerated,"V,M",,,
+Relay-IP-address,4411,,Address,"V,M",,,
+Remaining-Balance,2021,,Grouped,"V,M",,,
+Reply-Applic-ID,1223,,UTF8String,"V,M",,,
+Reply-Path-Requested,2011,,Enumerated,"V,M",,,
+Reporting-Reason,872,,Enumerated,"V,M",,,
+Requested-Party-Address,1251,,UTF8String,"V,M",,,
+Requested-PLMN-Identifier,3436,,UTF8String,"V,M",,,
+Requestor-PLMN-Identifier,3437,,UTF8String,"V,M",,,
+Role-Of-Node,829,,Enumerated,"V,M",,,
+Role-Of-ProSe-Function,3438,,Enumerated,"V,M",,,
+Route-Header-Received,3403,,UTF8String,"V,M",,,
+Route-Header-Transmitted,3404,,UTF8String,"V,M",,,
+Scale-Factor,2059,,Grouped,"V,M",,,
+SCEF-Address,1317,,Address,V,,,M
+SCS-Address,3941,,Address,"V,M",,,
+SCS-AS-Address,3940,,Grouped,"V,M",,,
+SCS-Realm,3942,,DiameterIdentity,"V,M",,,
+SDP-Answer-Timestamp,1275,,Time,"V,M",,,
+SDP-Media-Component,843,,Grouped,"V,M",,,
+SDP-Media-Description,845,,UTF8String,"V,M",,,
+SDP-Media-Name,844,,UTF8String,"V,M",,,
+SDP-Offer-Timestamp,1274,,Time,"V,M",,,
+SDP-Session-Description,842,,UTF8String,"V,M",,,
+SDP-TimeStamps,1273,,Grouped,"V,M",,,
+SDP-Type,2036,,Enumerated,"V,M",,,
+Secondary-RAT-Type,1304,,OctetString,V,,,M
+Serving-Node-Identity,3929,,DiameterIdentity,"V,M",,,
+Served-Party-IP-Address,848,,Address,"V,M",,,
+Service-Data-Container,2040,,Grouped,"V,M",,,
+Service-Id,855,,UTF8String,"V,M",,,
+Service-Information,873,,Grouped,"V,M",,,
+Service-Mode,2032,,Unsigned32,"V,M",,,
+Service-Specific-Data,863,,UTF8String,"V,M",,,
+Service-Specific-Info,1249,,Grouped,"V,M",,,
+Service-Specific-Type,1257,,Unsigned32,"V,M",,,
+Serving-Node-Type,2047,,Enumerated,"V,M",,,
+Session-Direction,2707,,Enumerated,"V,M",,,
+SGi-PtP-Tunnelling-Method,3931,,Enumerated,"V,M",,,
+SGSN-Address,1228,,Address,"V,M",,,
+SGW-Address,2067,,Address,"V,M",,,
+SGW-Change,2065,,Enumerated,"V,M",,,
+SIP-Method,824,,UTF8String,"V,M",,,
+SIP-Request-Timestamp,834,,Time,"V,M",,,
+SIP-Request-Timestamp-Fraction,2301,,Unsigned32,"V,M",,,
+SIP-Response-Timestamp,835,,Time,"V,M",,,
+SIP-Response-Timestamp-Fraction,2302,,Unsigned32,"V,M",,,
+SM-Device-Trigger-Indicator,3407,,Enumerated,"V,M",,,
+SM-Device-Trigger-Information,3405,,Grouped,"V,M",,,
+SM-Discharge-Time,2012,,Time,"V,M",,,
+SM-Message-Type,2007,,Enumerated,"V,M",,,
+SM-Protocol-ID,2013,,OctetString,"V,M",,,
+SM-Sequence-Number,3408,,Unsigned32,"V,M",,,
+SM-Service-Type,2029,,Enumerated,"V,M",,,
+SM-Status,2014,,OctetString,"V,M",,,
+SM-User-Data-Header,2015,,OctetString,"V,M",,,
+SMS-Information,2000,,Grouped,"V,M",,,
+SMS-Node,2016,,Enumerated,"V,M",,,
+SMS-Result,3409,,Unsigned32,"V,M",,,
+SMSC-Address,2017,,Address,"V,M",,,
+Start-of-Charging,3419,,Time,"V,M",,,
+Start-Time,2041,,Time,"V,M",,,
+# Note: 3GPP TS 32.299 V11.10.0 (2013-12) renamed,,,,,,,,
+"# Status (2702) to Status-Code (2702), and then",,,,,,,,
+# 3GPP TS 32.299 V11.14.0 (2014-12) renamed,,,,,,,,
+# Status-Code (2702) to Status-AS-Code (2702).,,,,,,,,
+Status-AS-Code,2702,,Enumerated,"V,M",,,
+Stop-Time,2042,,Time,"V,M",,,
+Submission-Time,1202,,Time,"V,M",,,
+Subscriber-Role,2033,,Enumerated,"V,M",,,
+Supplementary-Service,2048,,Grouped,"V,M",,,
+TAD-Identifier,2717,,Enumerated,"V,M",,,
+Talk-Burst-Exchange,1255,,Grouped,"V,M",,,
+Talk-Burst-Time,1286,,Unsigned32,"V,M",,,
+Talk-Burst-Volume,1287,,Unsigned32,"V,M",,,
+Target-IP-Address,4412,,Address,VM,,,
+Tariff-Information,2060,,Grouped,"V,M",,,
+Tariff-XML,2306,,UTF8String,"V,M",,,
+Teleservice,3413,,OctetString,"V,M",,,
+Terminating-IOI,840,,UTF8String,"V,M",,,
+Time-First-Reception,3466,,Time,"V,M",,,
+Time-First-Transmission,3467,,Time,"V,M",,,
+Time-First-Usage,2043,,Time,"V,M",,,
+Time-Indicator,3911,,Unsigned32,"V,M",,,
+Time-Last-Usage,2044,,Time,"V,M",,,
+Time-Quota-Mechanism,1270,,Grouped,"V,M",,,
+Time-Quota-Threshold,868,,Unsigned32,"V,M",,,
+Time-Quota-Type,1271,,Enumerated,"V,M",,,
+Time-Stamps,833,,Grouped,"V,M",,,
+Time-Usage,2045,,Unsigned32,"V,M",,,
+TLTRI,1318,,Unsigned32,V,,,M
+Token-Text,1215,,UTF8String,"V,M",,,
+Traffic-Data-Volumes,2046,,Grouped,"V,M",,,
+Transcoder-Inserted-Indication,2605,,Enumerated,"V,M",,,
+Transit-IOI-List,2701,,UTF8String,"V,M",,,
+Transmitter-Info,3468,,Grouped,"V,M",,,
+Trigger,1264,,Grouped,"V,M",,,
+Trigger-Type,870,,Enumerated,"V,M",,,
+Trunk-Group-Id,851,,Grouped,"V,M",,,
+TWAG-Address,3903,,Address,"V,M",,,
+TWAN-User-Location-Info,2714,,Grouped,"V,M",,,
+Type-Number,1204,,Enumerated,"V,M",,,
+UNI-PDU-CP-Only-Flag,3932,,Enumerated,"V,M",,,
+Unit-Cost,2061,,Grouped,"V,M",,,
+Unit-Quota-Threshold,1226,,Unsigned32,"V,M",,,
+Unused-Quota-Timer,4407,,Unsigned32,"V,M",,,
+Usage-Information-Report-Sequence-Number,3439,,Integer32,"V,M",,,
+User-CSG-Information,2319,,Grouped,"V,M",,,
+User-Participating-Type,1279,,Enumerated,"V,M",,,
+User-Session-Id,830,,UTF8String,"V,M",,,
+UWAN-User-Location-Info,3918,,Grouped,"V,M",,,
+Variable-Part,3907,,Grouped,"V,M",,,
+Variable-Part-Order,3908,,Unsigned32,"V,M",,,
+Variable-Part-Type,3909,,Unsigned32,"V,M",,,
+Variable-Part-Value,3910,,UTF8String,"V,M",,,
+VCS-Information,3410,,Grouped,"V,M",,,
+VLR-Number,3420,,OctetString,"V,M",,,
+Volume-Quota-Threshold,869,,Unsigned32,"V,M",,,
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-Address (890).,,,,,,,,
 WAG-Address,890,,Address,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-PLMN-Id (891).,,,,,,,,
 WAG-PLMN-Id,891,,OctetString,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Information (875).,,,,,,,,
 WLAN-Information,875,,Grouped,"M,V",P,,,N
+WLAN-Operator-Id,1306,,Grouped,V,,,M
+WLAN-Operator-Name,1307,,UTF8String,V,,,M
+WLAN-PLMN-Id,1308,,UTF8String,V,,,M
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Radio-Container (892).,,,,,,,,
 WLAN-Radio-Container,892,,Grouped,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Session-Id (1246).,,,,,,,,
 WLAN-Session-Id,1246,,UTF8String,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Technology (893).,,,,,,,,
 WLAN-Technology,893,,Unsigned32,"M,V",P,,,N
+# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-UE-Local-IPAddress (894).,,,,,,,,
 WLAN-UE-Local-IPAddress,894,,Address,"M,V",P,,,N
 ,,,,,,,,
 @standard,OMA DDS Charging Data,,,,,,,