diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn
index 26e9842480aa73a4215f428f4605d1f81f6e8f93..ceee396ea670166c516f32dcbeb5dbdb46b6c938 100644
--- a/33128/r17/TS33128Payloads.asn
+++ b/33128/r17/TS33128Payloads.asn
@@ -4495,7 +4495,8 @@ Location ::= SEQUENCE
     locationInfo                [1] LocationInfo OPTIONAL,
     positioningInfo             [2] PositioningInfo OPTIONAL,
     locationPresenceReport      [3] LocationPresenceReport OPTIONAL,
-    ePSLocationInfo             [4] EPSLocationInfo OPTIONAL
+    fourGPositioningInfo        [4] FourGPositioningInfo OPTIONAL,
+    fourGLocationInfo           [5] FourGLocationInfo OPTIONAL
 }
 
 CellSiteInformation ::= SEQUENCE
@@ -4630,6 +4631,15 @@ SAI ::= SEQUENCE
 
 SAC ::= OCTET STRING (SIZE(2))
 
+RAI ::= SEQUENCE
+{
+    pLMNID [1] PLMNID,
+    lAC    [2] LAC,
+    rAC    [3] RAC
+}
+
+RAC ::= OCTET STRING (SIZE(2))
+
 -- TS 29.571 [17], clause 5.4.4.5
 ECGI ::= SEQUENCE
 {
@@ -4782,13 +4792,115 @@ LocationData ::= SEQUENCE
     barometricPressure          [11] BarometricPressure OPTIONAL
 }
 
+-- TS 29.172 [53], clause 7.4.29
+GERANPositioningInfo ::= SEQUENCE
+{
+    gERANPositioningData      [1] GERANPositioningData OPTIONAL,
+    gERANGANSSPositioningData [2] GERANGANSSPositioningData OPTIONAL
+}
+
+-- TS 29.172 [53], clause 7.4.30
+GERANPositioningData ::= OCTET STRING
+
+-- TS 29.172 [53], clause 7.4.31
+GERANGANSSPositioningData ::= OCTET STRING
+
+-- TS 29.172 [53], clause 7.4.32
+UTRANPositioningInfo ::= SEQUENCE
+{
+    uTRANPositioningData      [1] UTRANPositioningData OPTIONAL,
+    uTRANGANSSPositioningData [2] UTRANGANSSPositioningData OPTIONAL,
+    uTRANAdditionalPositioningData [3] UTRANAdditionalPositioningData OPTIONAL
+}
+
+-- TS 29.172 [53], clause 7.4.33
+UTRANPositioningData ::= OCTET STRING
+
+-- TS 29.172 [53], clause 7.4.34
+UTRANGANSSPositioningData ::= OCTET STRING
+
+-- TS 29.172 [53], clause 7.4.63
+UTRANAdditionalPositioningData ::= OCTET STRING
+
 -- TS 29.172 [53], table 6.2.2-2
-EPSLocationInfo ::= SEQUENCE
+FourGPositioningInfo ::= SEQUENCE
+{
+    locationData         [1] LocationData,
+    cGI                  [2] CGI OPTIONAL,
+    sAI                  [3] SAI OPTIONAL,
+    eSMLCCellInfo        [4] ESMLCCellInfo OPTIONAL,
+    gERANPositioningInfo [5] GERANPositioningInfo OPTIONAL,
+    uTRANPositioningInfo [6] UTRANPositioningInfo OPTIONAL,
+    rawMLPResponse       [7] RawMLPResponse OPTIONAL
+}
+
+FourGLocationInfo ::= CHOICE
+{
+    ePSLocationInformation     [1] EPSLocationInformation,
+    ePSUserLocationInformation [2] EPSUserLocationInformation
+}
+
+-- TS 29.272 [Re1], clause 7.3.111
+EPSLocationInformation ::= SEQUENCE
+{
+    mMELocationInformation  [1] MMELocationInformation OPTIONAL,
+    sGSNLocationInformation [2] SGSNLocationInformation OPTIONAL
+}
+
+-- TS 29.274 [87], clause 8.21
+EPSUserLocationInformation ::= OCTET STRING
+
+-- TS 29.272 [Re1], clause 7.3.115
+MMELocationInformation ::= SEQUENCE
 {
-    locationData  [1] LocationData,
-    cGI           [2] CGI OPTIONAL,
-    sAI           [3] SAI OPTIONAL,
-    eSMLCCellInfo [4] ESMLCCellInfo OPTIONAL
+    eCGI                     [1] ECGI OPTIONAL,
+    tAI                      [2] TAI OPTIONAL,
+    geographicalInformation  [3] GeographicalInformationOctet OPTIONAL,
+    geodeticInformation      [4] GeodeticInformationOctet OPTIONAL,
+    currentLocationRetrieved [5] BOOLEAN OPTIONAL,
+    ageOfLocationInformation [6] INTEGER OPTIONAL,
+    userCSGInformation       [7] UserCSGInformation OPTIONAL,
+    eNbID                    [8] ENbID OPTIONAL,
+    additionalCellIDs        [9] SEQUENCE OF CellInformation OPTIONAL
+}
+
+-- TS 32.299 [Re2], clause 7.3.240A
+UserCSGInformation ::= SEQUENCE
+{
+    cSGID                   [1] CSGID,
+    cSGAccessMode           [2] CSGAccessMode,
+    cSGMembershipIndication [3] CSGMembershipIndication
+}
+
+-- TS 29.272 [Re1], clause 7.3.79
+CSGID ::= INTEGER
+
+-- TS 32.299 [Re2], clause 7.2.46A
+CSGAccessMode ::= ENUMERATED
+{
+    closedMode(1),
+    hybridMode(2)
+}
+
+-- TS 32.299 [Re2], clause 7.2.46B
+CSGMembershipIndication ::= ENUMERATED
+{
+    notCSGMember(1),
+    cSGMember(2)
+}
+
+-- TS 29.272 [Re1], clause 7.3.116
+SGSNLocationInformation ::= SEQUENCE
+{
+    cGI                      [1] CGI OPTIONAL,
+    lAI                      [2] LAI OPTIONAL,
+    sAI                      [3] SAI OPTIONAL,
+    rAI                      [4] RAI OPTIONAL,
+    geographicalInformation  [5] GeographicalInformationOctet OPTIONAL,
+    geodeticInformation      [6] GeodeticInformationOctet OPTIONAL,
+    currentLocationRetrieved [7] BOOLEAN OPTIONAL,
+    ageOfLocationInformation [8] INTEGER OPTIONAL,
+    userCSGInformation       [9] UserCSGInformation OPTIONAL
 }
 
 -- TS 29.172 [53], clause 7.4.57
@@ -4905,6 +5017,12 @@ GeographicArea ::= CHOICE
     ellipsoidArc                [7] EllipsoidArc
 }
 
+-- TS 29.002 [47], clause 17.7.1, type GeographicalInformation
+GeographicalInformationOctet ::= OCTET STRING (SIZE (8))
+
+-- TS 29.002 [47], clause 17.7.1, type GeodeticInformation
+GeodeticInformationOctet ::= OCTET STRING (SIZE (10))
+
 -- TS 29.572 [24], clause 6.1.6.3.12
 AccuracyFulfilmentIndicator ::= ENUMERATED
 {