diff --git a/diameter/TGPPRx.xml b/diameter/TGPPRx.xml
index 9690b2b6a0..a6441415d8 100644
--- a/diameter/TGPPRx.xml
+++ b/diameter/TGPPRx.xml
@@ -42,7 +42,19 @@ Is defined in gqpolicy.xml
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/diameter/TGPPSh.xml b/diameter/TGPPSh.xml
index 551de96dd2..e43f9d4b9c 100644
--- a/diameter/TGPPSh.xml
+++ b/diameter/TGPPSh.xml
@@ -97,7 +97,13 @@
+
+
+
+
+
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 4802d16cfd..9c63263847 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -2606,11 +2606,13 @@ Note: The AVP codes from 256 to 299 are reserved for future use.
316 Primary-OCS-Charging-Function-Name DiameterIdentity
317 Secondary-OCS-Charging-Function-Name DiameterIdentity
-->
-
-
+
+
+
+
+
@@ -2750,15 +2752,15 @@ Note: The AVP codes from 421 to 499 are reserved for TS 29.109
-->
@@ -3833,7 +3835,15 @@ Note: The AVP codes from 900 to 999 are reserved for TS 29.061
-
+
@@ -5239,8 +5249,11 @@ Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
+
+
+
-
@@ -5625,8 +5638,11 @@ Note: The AVP codes from 1638 to 1699 are reserved for TS 29.272.
+
+
+
-
+
@@ -5743,8 +5759,10 @@ Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
2317 CSG-Access-Mode Enumerated
2318 CSG-Membership-Indication Enumerated
2319 User-CSG-Information Grouped
+2320 Outgoing-Session-Id UTF8String
+2321 Initial-IMS-Charging-Identifier UTF8String
-Note: The AVP codes from 2320 to 2399 are reserved for TS 32.299
+Note: The AVP codes from 2322 to 2399 are reserved for TS 32.299
2400 LMSI OctetString
2401 Serving-Node Grouped
2402 MME-Name DiameterIdentity
@@ -5753,7 +5771,8 @@ Note: The AVP codes from 2320 to 2399 are reserved for TS 32.299
2405 GMLC-Address Address
2406 Additional-Serving-Node Grouped
2407 PPR-Address Address
-Note: The AVP codes from 2408 to 2499 are reserved for TS 29.173
+2408 MME-Realm DiameterIdentity
+Note: The AVP codes from 2409 to 2499 are reserved for TS 29.173
-->
@@ -5791,10 +5810,14 @@ Note: The AVP codes from 2408 to 2499 are reserved for TS 29.173
+
+
+
+
+
+
-
@@ -5866,6 +5889,14 @@ Note: The AVP codes from 2408 to 2499 are reserved for TS 29.173