diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn
index 34d2943f528ec5fbc6d38306e08a48bd1bd6275f..c6ca3aad2efc32d08af83ff99015268d73324a54 100644
--- a/33128/r17/TS33128Payloads.asn
+++ b/33128/r17/TS33128Payloads.asn
@@ -1215,7 +1215,15 @@ AMFRegistration ::= SEQUENCE
     mACRestIndicator            [16] MACRestrictionIndicator OPTIONAL,
     pagingRestrictionIndicator  [17] PagingRestrictionIndicator OPTIONAL,
     rATType                     [18] RATType OPTIONAL,
-    additionalUserIdentifiers   [19] UserIdentifiers OPTIONAL
+
+    -- Tags 19 to 30 are not used in this version of the specification
+
+    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
+    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
+    -- tag 19 was additionalUserIdentifiers (now tag 31).
+    -- These fields were renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
+    -- to avoid conflict and permit interoperability with newer releases.
+    additionalUserIdentifiers   [31] UserIdentifiers OPTIONAL
 }
 
 -- See clause 6.2.2.2.3 for details of this structure
@@ -1232,7 +1240,15 @@ AMFDeregistration ::= SEQUENCE
     location                    [9] Location OPTIONAL,
     switchOffIndicator          [10] SwitchOffIndicator OPTIONAL,
     reRegRequiredIndicator      [11] ReRegRequiredIndicator OPTIONAL,
-    additionalUserIdentifiers   [12] UserIdentifiers OPTIONAL
+
+    -- Tag 12 is not used in this version of the specification
+
+    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
+    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
+    -- tag 12 was additionalUserIdentifiers (now tag 13).
+    -- This field was renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
+    -- to avoid conflict and permit interoperability with newer releases.
+    additionalUserIdentifiers   [13] UserIdentifiers OPTIONAL
 }
 
 -- See clause 6.2.2.2.4 for details of this structure
@@ -1246,7 +1262,15 @@ AMFLocationUpdate ::= SEQUENCE
     location                    [6] Location,
     sMSOverNASIndicator         [7] SMSOverNASIndicator OPTIONAL,
     oldGUTI                     [8] EPS5GGUTI OPTIONAL,
-    additionalUserIdentifiers   [9] UserIdentifiers OPTIONAL
+
+    -- Tag 9 is not used in this version of the specification
+
+    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
+    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
+    -- tag 9 was additionalUserIdentifiers (now tag 10).
+    -- This field was renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
+    -- to avoid conflict and permit interoperability with newer releases.
+    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL
 }
 
 -- See clause 6.2.2.2.5 for details of this structure
@@ -1267,7 +1291,15 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE
     sMSOverNASIndicator         [13] SMSOverNASIndicator OPTIONAL,
     oldGUTI                     [14] EPS5GGUTI OPTIONAL,
     eMM5GRegStatus              [15] EMM5GMMStatus OPTIONAL,
-    additionalUserIdentifiers   [16] UserIdentifiers OPTIONAL
+
+    -- Tags 16 to 20 are not used in this version of the specification
+
+    -- In V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)) through
+    -- to V17.21.0 (threeGPP(4) ts33128(19) r17(17) version15(15)),
+    -- tag 16 was additionalUserIdentifiers (now tag 21).
+    -- These fields were renumbered in V17.22.0 (threeGPP(4) ts33128(19) r17(17) version16(16))
+    -- to avoid conflict and permit interoperability with newer releases.
+    additionalUserIdentifiers   [21] UserIdentifiers OPTIONAL
 }
 
 -- See clause 6.2.2.2.6 for details of this structure
diff --git a/testing/asn_lint_exceptions.json b/testing/asn_lint_exceptions.json
index c61b5c40d8d1264d01ac248183f1034dad6cd151..c152b7bbef07f6f03628727bb80ccd87b02f5a03 100644
--- a/testing/asn_lint_exceptions.json
+++ b/testing/asn_lint_exceptions.json
@@ -49,7 +49,11 @@
         "Tags 133-164 missing in XIRIEvent",
         "Tags 167-185 missing in XIRIEvent",
         "Tags 133-164 missing in IRIEvent",
-        "Tags 167-185 missing in IRIEvent"
+        "Tags 167-185 missing in IRIEvent",
+        "Tags 19-30 missing in AMFRegistration",
+        "Tag 12 missing in AMFDeregistration",
+        "Tag 9 missing in AMFLocationUpdate",
+        "Tags 16-20 missing in AMFStartOfInterceptionWithRegisteredUE"
     ],
     "33128/r18/TS33128Payloads.asn" : [
         "Tag 100 XIRIEvent field 'n9HRPDUSessionInfo' is not present in IRIEvent",