XnAP: upgrade dissector to v15.4.0

Change-Id: Ia26593e7895709671a7a9d4a51bb6788e4059c94 Reviewed-on: https://code.wireshark.org/review/34015 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
author: Pascal Quantin <pascal@wireshark.org> 2019-07-19 14:15:32 +0200
committer: Pascal Quantin <pascal@wireshark.org> 2019-07-19 12:46:44 +0000
commit: c7884e217045477a949af26a547fa5ecc83dcad5 (patch)
tree: 2b18253f83f9faa50d1587bc115838776db7ea50
parent: dfb147269f3bb54abdf5b515f2e6a5856ff7c6b5 (diff)
15 files changed, 921 insertions, 273 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
index e58712e465..53aa22b49b 100644
--- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
+++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
@@ -55,6 +55,7 @@ SCG-Config-r12_PDU
 SCG-ConfigInfo-r12_PDU
 UEPagingCoverageInformation_PDU
 UEPagingCoverageInformation-NB_PDU
+UERadioPagingInformation_PDU
 UE-EUTRA-Capability_PDU
 VisitedCellInfo-r12_PDU
 VisitedCellInfoList-r12_PDU
diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
index 3a1fa79a19..e60ba0cd4e 100644
--- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
+++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
@@ -76,6 +76,7 @@ UE-CapabilityRequestFilterNR_PDU
 UE-MRDC-Capability_PDU
 UE-NR-Capability_PDU
 UEAssistanceInformation_PDU
+UERadioPagingInformation_PDU
 UL-DCCH-Message_PDU
 UplinkTxDirectCurrentList_PDU
 
diff --git a/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn b/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
index 5cfce3b7e2..33b606e236 100644
--- a/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V15.3.0 (2019-03)
+-- 3GPP TS 38.423 V15.4.0 (2019-07)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/xnap/XnAP-Constants.asn b/epan/dissectors/asn1/xnap/XnAP-Constants.asn
index 00c3e0b145..8075729c51 100644
--- a/epan/dissectors/asn1/xnap/XnAP-Constants.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V15.3.0 (2019-03)
+-- 3GPP TS 38.423 V15.4.0 (2019-07)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -64,7 +64,7 @@ id-secondaryRATDataUsageReport									ProcedureCode ::= 26
 
 maxEARFCN									INTEGER ::= 262143
 maxnoofAllowedAreas							INTEGER ::= 16
-maxnoofAMFSets								INTEGER ::= 16
+maxnoofAMFRegions							INTEGER ::= 16
 maxnoofAoIs									INTEGER ::= 64
 maxnoofBPLMNs								INTEGER ::= 12
 maxnoofCellsinAoI							INTEGER ::= 256
@@ -74,6 +74,7 @@ maxnoofCellsinRNA							INTEGER ::= 32
 maxnoofCellsUEMovingTrajectory				INTEGER ::= 16
 maxnoofDRBs									INTEGER ::= 32
 maxnoofEUTRABands							INTEGER ::= 16
+maxnoofEUTRABPLMNs							INTEGER ::= 6
 maxnoofEPLMNs								INTEGER ::= 15
 maxnoofForbiddenTACs							INTEGER ::= 4096
 maxnoofMBSFNEUTRA							INTEGER ::= 8
@@ -110,7 +111,7 @@ id-ActivatedServedCells																				ProtocolIE-ID ::= 0
 id-ActivationIDforCellActivation																	ProtocolIE-ID ::= 1
 id-admittedSplitSRB																					ProtocolIE-ID ::= 2
 id-admittedSplitSRBrelease																			ProtocolIE-ID ::= 3
-id-AMF-Set-Information																				ProtocolIE-ID ::= 4
+id-AMF-Region-Information																			ProtocolIE-ID ::= 4
 id-AssistanceDataForRANPaging																		ProtocolIE-ID ::= 5
 id-BearersSubjectToCounterCheck																		ProtocolIE-ID ::= 6
 id-Cause																							ProtocolIE-ID ::= 7
@@ -134,7 +135,7 @@ id-MN-to-SN-Container																				ProtocolIE-ID ::= 24
 id-MobilityRestrictionList																			ProtocolIE-ID ::= 25
 id-new-NG-RAN-Cell-Identity																			ProtocolIE-ID ::= 26
 id-newNG-RANnodeUEXnAPID																			ProtocolIE-ID ::= 27
-id-UEReportRRCTransfer																			ProtocolIE-ID ::= 28
+id-UEReportRRCTransfer																				ProtocolIE-ID ::= 28
 id-oldNG-RANnodeUEXnAPID																			ProtocolIE-ID ::= 29
 id-OldtoNewNG-RANnodeResumeContainer																ProtocolIE-ID ::= 30
 id-PagingDRX																						ProtocolIE-ID ::= 31
@@ -212,7 +213,8 @@ id-TNLA-Setup-List																					ProtocolIE-ID ::= 102
 id-TNLA-Failed-To-Setup-List																		ProtocolIE-ID ::= 103
 id-PDUSessionToBeReleased-RelReqAck																	ProtocolIE-ID ::= 104
 id-S-NG-RANnodeMaxIPDataRate-UL																		ProtocolIE-ID ::= 105
-id-PDUSession-List-withDataForwardingRequest														ProtocolIE-ID ::= 106
+-- WS extension
+id-Unknown-106																						ProtocolIE-ID ::= 106
 id-PDUSessionResourceSecondaryRATUsageList															ProtocolIE-ID ::= 107
 id-Additional-UL-NG-U-TNLatUPF-List																	ProtocolIE-ID ::= 108
 id-SecondarydataForwardingInfoFromTarget-List														ProtocolIE-ID ::= 109
@@ -224,5 +226,18 @@ id-MaxIPrate-DL																						ProtocolIE-ID ::= 114
 id-SecurityResult																					ProtocolIE-ID ::= 115
 id-S-NSSAI																							ProtocolIE-ID ::= 116
 id-MR-DC-ResourceCoordinationInfo																	ProtocolIE-ID ::= 117
+id-AMF-Region-Information-To-Add																	ProtocolIE-ID ::= 118
+id-AMF-Region-Information-To-Delete																	ProtocolIE-ID ::= 119
+id-OldQoSFlowMap-ULendmarkerexpected																ProtocolIE-ID ::= 120
+id-RANPagingFailure																					ProtocolIE-ID ::= 121
+id-UERadioCapabilityForPaging																		ProtocolIE-ID ::= 122
+id-PDUSessionDataForwarding-SNModResponse															ProtocolIE-ID ::= 123
+id-DRBsNotAdmittedSetupModifyList																	ProtocolIE-ID ::= 124
+id-Secondary-MN-Xn-U-TNLInfoatM																		ProtocolIE-ID ::= 125
+id-NE-DC-TDM-Pattern																				ProtocolIE-ID ::= 126
+id-PDUSessionCommonNetworkInstance																	ProtocolIE-ID ::= 127
+id-BPLMN-ID-Info-EUTRA																				ProtocolIE-ID ::= 128
+id-BPLMN-ID-Info-NR																					ProtocolIE-ID ::= 129
+id-InterfaceInstanceIndication																		ProtocolIE-ID ::= 130
 
 END
diff --git a/epan/dissectors/asn1/xnap/XnAP-Containers.asn b/epan/dissectors/asn1/xnap/XnAP-Containers.asn
index ae172f7d0f..3fe224cdc5 100644
--- a/epan/dissectors/asn1/xnap/XnAP-Containers.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V15.2.0 (2019-03)
+-- 3GPP TS 38.423 V15.4.0 (2019-07)
 -- 9.3.8	Container definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/xnap/XnAP-IEs.asn b/epan/dissectors/asn1/xnap/XnAP-IEs.asn
index aaa3ed969b..1eb58899e0 100644
--- a/epan/dissectors/asn1/xnap/XnAP-IEs.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V15.3.0 (2019-03)
+-- 3GPP TS 38.423 V15.4.0 (2019-07)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -22,9 +22,15 @@ IMPORTS
 	id-LastE-UTRANPLMNIdentity,
 	id-MaxIPrate-DL,
 	id-SecurityResult,
+	id-OldQoSFlowMap-ULendmarkerexpected,
+	id-PDUSessionCommonNetworkInstance,
+	id-BPLMN-ID-Info-EUTRA,
+	id-BPLMN-ID-Info-NR,
+	id-DRBsNotAdmittedSetupModifyList,
+	id-Secondary-MN-Xn-U-TNLInfoatM,
 	maxEARFCN,
 	maxnoofAllowedAreas,
-	maxnoofAMFSets,
+	maxnoofAMFRegions,
 	maxnoofAoIs,
 	maxnoofBPLMNs,
 	maxnoofCellsinAoI,
@@ -35,6 +41,7 @@ IMPORTS
 	maxnoofDRBs,
 	maxnoofEPLMNs,
 	maxnoofEUTRABands,
+	maxnoofEUTRABPLMNs,
 	maxnoofForbiddenTACs,
 	maxnoofMBSFNEUTRA,
 	maxnoofMultiConnectivityMinusOne,
@@ -109,17 +116,16 @@ AllocationandRetentionPriority-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 ActivationSFN ::= INTEGER (0..1023)
 
 
-AMF-Set-Information ::= SEQUENCE (SIZE (1..maxnoofAMFSets)) OF GlobalAMF-Set-Information
+AMF-Region-Information ::= SEQUENCE (SIZE (1..maxnoofAMFRegions)) OF GlobalAMF-Region-Information
 
-GlobalAMF-Set-Information ::= SEQUENCE {
+GlobalAMF-Region-Information ::= SEQUENCE {
 	plmn-ID				PLMN-Identity,
 	amf-region-id		BIT STRING (SIZE (8)),
-	amf-set-id			BIT STRING (SIZE (10)),
-	iE-Extensions					ProtocolExtensionContainer { {GlobalAMF-Set-Information-ExtIEs} } OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {GlobalAMF-Region-Information-ExtIEs} } OPTIONAL,
 	...
 }
 
-GlobalAMF-Set-Information-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+GlobalAMF-Region-Information-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -171,12 +177,43 @@ AveragingWindow ::= INTEGER (0..4095, ...)
 
 -- B
 
+BPLMN-ID-Info-EUTRA ::= SEQUENCE (SIZE(1..maxnoofEUTRABPLMNs)) OF BPLMN-ID-Info-EUTRA-Item
+
+BPLMN-ID-Info-EUTRA-Item ::= SEQUENCE {
+	broadcastPLMNs					BroadcastEUTRAPLMNs,
+	tac								TAC,
+	e-utraCI						E-UTRA-Cell-Identity,
+	ranac							RANAC OPTIONAL, 
+	iE-Extension					ProtocolExtensionContainer { {BPLMN-ID-Info-EUTRA-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+BPLMN-ID-Info-EUTRA-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+BPLMN-ID-Info-NR ::= SEQUENCE (SIZE(1..maxnoofBPLMNs)) OF BPLMN-ID-Info-NR-Item
+
+BPLMN-ID-Info-NR-Item ::= SEQUENCE {
+	broadcastPLMNs					BroadcastPLMNs,
+	tac								TAC,
+	nr-CI							NR-Cell-Identity,
+	ranac							RANAC OPTIONAL, 
+	iE-Extension					ProtocolExtensionContainer { {BPLMN-ID-Info-NR-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+BPLMN-ID-Info-NR-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 BitRate	::= INTEGER (0..4000000000000,...)
 
 
 BroadcastPLMNs ::= SEQUENCE (SIZE(1..maxnoofBPLMNs)) OF PLMN-Identity
 
+BroadcastEUTRAPLMNs ::= SEQUENCE (SIZE(1..maxnoofEUTRABPLMNs)) OF PLMN-Identity
+
 
 BroadcastPLMNinTAISupport-Item ::= SEQUENCE {
 	plmn-id							PLMN-Identity,
@@ -543,6 +580,7 @@ DRBsSubjectToStatusTransfer-Item ::= SEQUENCE {
 }
 
 DRBsSubjectToStatusTransfer-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-OldQoSFlowMap-ULendmarkerexpected	CRITICALITY reject		EXTENSION QoSFlows-List					PRESENCE optional },
 	...
 }
 
@@ -587,7 +625,6 @@ DRBToQoSFlowMapping-List ::= SEQUENCE (SIZE (1..maxnoofDRBs)) OF DRBToQoSFlowMap
 DRBToQoSFlowMapping-Item ::= SEQUENCE {
 	drb-ID							DRB-ID,
 	qosFlows-List					QoSFlows-List,
-	qosFlowMappingIndication		QoSFlowMappingIndication			OPTIONAL,
 	rLC-Mode						RLCMode								OPTIONAL,
 	iE-Extension		ProtocolExtensionContainer { {DRBToQoSFlowMapping-Item-ExtIEs} }	OPTIONAL,
 	...
@@ -862,6 +899,7 @@ GUAMI-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 
 -- I
 
+InterfaceInstanceIndication ::= INTEGER (0..255, ...)
 
 I-RNTI ::= CHOICE {
 	i-RNTI-full			BIT STRING (SIZE(40)), 
@@ -1147,6 +1185,16 @@ NR-CoordinationAssistanceInfo ::= ENUMERATED {coordination-not-required, ...}
 
 -- N
 
+NE-DC-TDM-Pattern ::= SEQUENCE {
+		subframeAssignment			ENUMERATED {sa0,sa1,sa2,sa3,sa4,sa5,sa6},
+		harqOffset					INTEGER (0..9),
+		iE-Extension				ProtocolExtensionContainer { {NE-DC-TDM-Pattern-ExtIEs}}	OPTIONAL,
+		...
+}
+
+NE-DC-TDM-Pattern-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+...
+}
 
 NeighbourInformation-E-UTRA ::= SEQUENCE (SIZE(1..maxnoofNeighbours)) OF NeighbourInformation-E-UTRA-Item
 
@@ -1497,7 +1545,7 @@ PDUSession-List-withDataForwardingRequest ::= SEQUENCE (SIZE (1.. maxnoofPDUSess
 
 PDUSession-List-withDataForwardingRequest-Item ::= SEQUENCE {
 	pduSessionId							PDUSession-ID,
-	dataforwardingInfofromSource			DataforwardingandOffloadingInfofromSource,
+	dataforwardingInfofromSource			DataforwardingandOffloadingInfofromSource					OPTIONAL,
 	dRBtoBeReleasedList						DRBToQoSFlowMapping-List									OPTIONAL,
 	iE-Extension		ProtocolExtensionContainer { {PDUSession-List-withDataForwardingRequest-Item-ExtIEs} }	OPTIONAL,
 	...
@@ -1598,7 +1646,8 @@ PDUSessionResourcesToBeSetup-Item ::= SEQUENCE {
 }
 
 PDUSessionResourcesToBeSetup-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-{ ID id-Additional-UL-NG-U-TNLatUPF-List	CRITICALITY ignore	EXTENSION Additional-UL-NG-U-TNLatUPF-List 	PRESENCE optional},
+{ ID id-Additional-UL-NG-U-TNLatUPF-List	CRITICALITY ignore	EXTENSION Additional-UL-NG-U-TNLatUPF-List 	PRESENCE optional}|
+{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional},
 	...
 }
 
@@ -1622,7 +1671,8 @@ PDUSessionResourceSetupInfo-SNterminated ::= SEQUENCE {
 }
 
 PDUSessionResourceSetupInfo-SNterminated-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-SecurityResult		CRITICALITY reject	EXTENSION SecurityResult		PRESENCE optional},
+	{ ID id-SecurityResult						CRITICALITY reject	EXTENSION SecurityResult							PRESENCE optional}|
+	{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional},
 	...
 }
 
@@ -1649,10 +1699,10 @@ QoSFlowsToBeSetup-List-Setup-SNterminated-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::
 
 PDUSessionResourceSetupResponseInfo-SNterminated ::= SEQUENCE {
 	dL-NG-U-TNLatNG-RAN				UPTransportLayerInformation,
-	dRBsToBeSetup					DRBsToBeSetupList-SetupResponse-SNterminated,
-	dataforwardinginfoTarget		DataForwardingInfoFromTargetNGRANnode		OPTIONAL,
-	qosFlowsNotAdmittedList			QoSFlows-List-withCause						OPTIONAL,
-	securityResult					SecurityResult								OPTIONAL,
+	dRBsToBeSetup					DRBsToBeSetupList-SetupResponse-SNterminated 	OPTIONAL,
+	dataforwardinginfoTarget		DataForwardingInfoFromTargetNGRANnode			OPTIONAL,
+	qosFlowsNotAdmittedList			QoSFlows-List-withCause							OPTIONAL,
+	securityResult					SecurityResult									OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { {PDUSessionResourceSetupResponseInfo-SNterminated-ExtIEs} } 	OPTIONAL,
 	...
 }
@@ -1764,6 +1814,7 @@ PDUSessionResourceSetupResponseInfo-MNterminated ::= SEQUENCE {
 }
 
 PDUSessionResourceSetupResponseInfo-MNterminated-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ID id-DRBsNotAdmittedSetupModifyList	CRITICALITY ignore	EXTENSION DRB-List-withCause		PRESENCE optional},
 	...
 }
 
@@ -1804,6 +1855,8 @@ PDUSessionResourceModificationInfo-SNterminated ::= SEQUENCE {
 }
 
 PDUSessionResourceModificationInfo-SNterminated-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional},
+
 	...
 }
 
@@ -1846,7 +1899,7 @@ DRBsToBeModified-List-Modified-SNterminated-Item-ExtIEs XNAP-PROTOCOL-EXTENSION
 
 
 PDUSessionResourceModificationResponseInfo-SNterminated ::= SEQUENCE {
-	dL-NG-U-TNLatNG-RAN				UPTransportLayerInformation,
+	dL-NG-U-TNLatNG-RAN				UPTransportLayerInformation								OPTIONAL,
 	dRBsToBeSetup					DRBsToBeSetupList-SetupResponse-SNterminated			OPTIONAL,
 	dataforwardinginfoTarget		DataForwardingInfoFromTargetNGRANnode					OPTIONAL,
 	dRBsToBeModified				DRBsToBeModifiedList-ModificationResponse-SNterminated	OPTIONAL,
@@ -1869,7 +1922,6 @@ DRBsToBeModifiedList-ModificationResponse-SNterminated-Item ::= SEQUENCE {
 	drb-ID													DRB-ID,
 	sN-UL-PDCP-UP-TNLInfo									UPTransportParameters									OPTIONAL,
 	dRB-QoS													QoSFlowLevelQoSParameters								OPTIONAL,
-	pDCP-SNLength											PDCPSNLength											OPTIONAL,
 	qoSFlowsMappedtoDRB-SetupResponse-SNterminated			QoSFlowsMappedtoDRB-SetupResponse-SNterminated		OPTIONAL,
 	iE-Extensions		ProtocolExtensionContainer { {DRBsToBeModifiedList-ModificationResponse-SNterminated-Item-ExtIEs} } 	OPTIONAL,
 	...
@@ -1907,7 +1959,6 @@ DRBsToBeModifiedList-Modification-MNterminated-Item ::= SEQUENCE {
 	drb-ID													DRB-ID,
 	mN-UL-PDCP-UP-TNLInfo									UPTransportParameters						OPTIONAL,
 	dRB-QoS													QoSFlowLevelQoSParameters					OPTIONAL,
-	pDCP-SNLength											PDCPSNLength								OPTIONAL,
 	secondary-MN-UL-PDCP-UP-TNLInfo							UPTransportParameters						OPTIONAL,
 	uL-Configuration										ULConfiguration								OPTIONAL,
 	pdcpDuplicationConfiguration							PDCPDuplicationConfiguration 				OPTIONAL,
@@ -2231,6 +2282,7 @@ DRBsToBeSetupList-BearerSetupComplete-SNterminated-Item ::= SEQUENCE {
 }
 
 DRBsToBeSetupList-BearerSetupComplete-SNterminated-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ID id-Secondary-MN-Xn-U-TNLInfoatM	CRITICALITY ignore	EXTENSION UPTransportLayerInformation		PRESENCE optional},
 	...
 }
 
@@ -2270,6 +2322,8 @@ PDUSession-ID	::= INTEGER (0..255)
 
 PDUSessionNetworkInstance	::= INTEGER (1..256, ...)
 
+PDUSessionCommonNetworkInstance	::= OCTET STRING
+
 PLMN-Identity ::= OCTET STRING (SIZE(3))
 
 
@@ -2373,7 +2427,8 @@ QoSFlowNotificationControlIndicationInfo-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 QoSFlows-List ::= SEQUENCE (SIZE (1..maxnoofQoSFlows)) OF QoSFlow-Item
 
 QoSFlow-Item ::= SEQUENCE {
-	qfi					QoSFlowIdentifier,
+	qfi								QoSFlowIdentifier,
+	qosFlowMappingIndication		QoSFlowMappingIndication					OPTIONAL,
 	iE-Extension		ProtocolExtensionContainer { {QoSFlow-Item-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -2414,7 +2469,6 @@ QoSFlowsToBeSetup-List ::= SEQUENCE (SIZE (1..maxnoofQoSFlows)) OF QoSFlowsToBeS
 
 QoSFlowsToBeSetup-Item ::= SEQUENCE {
 	qfi								QoSFlowIdentifier,
-	dlDataForwarding				DLForwarding										OPTIONAL,
 	qosFlowLevelQoSParameters		QoSFlowLevelQoSParameters,
 	e-RAB-ID						E-RAB-ID											OPTIONAL,
 	iE-Extension		ProtocolExtensionContainer { {QoSFlowsToBeSetup-Item-ExtIEs} }	OPTIONAL,
@@ -2494,6 +2548,10 @@ RANPagingAttemptInfo-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+RANPagingFailure		::= 	ENUMERATED {
+	true,
+	...
+}
 
 ReferenceID ::= INTEGER (1..64, ...) -- This IE may need to be refined.
 
@@ -2726,6 +2784,7 @@ ServedCellInformation-E-UTRA ::= SEQUENCE {
 }
 
 ServedCellInformation-E-UTRA-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-BPLMN-ID-Info-EUTRA		CRITICALITY ignore	EXTENSION BPLMN-ID-Info-EUTRA		PRESENCE optional },
 	...
 }
 
@@ -2842,6 +2901,7 @@ ServedCellInformation-NR ::= SEQUENCE {
 }
 
 ServedCellInformation-NR-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-BPLMN-ID-Info-NR		CRITICALITY ignore	EXTENSION BPLMN-ID-Info-NR		PRESENCE optional },
 	...
 }
 
@@ -3276,6 +3336,20 @@ UEIdentityIndexValue-ExtIEs XNAP-PROTOCOL-IES ::= {
 	...
 }
 
+UERadioCapabilityForPaging ::= SEQUENCE {
+	uERadioCapabilityForPagingOfNR			UERadioCapabilityForPagingOfNR			OPTIONAL,
+	uERadioCapabilityForPagingOfEUTRA		UERadioCapabilityForPagingOfEUTRA		OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { {UERadioCapabilityForPaging-ExtIEs} }	OPTIONAL,
+	...
+}
+
+UERadioCapabilityForPaging-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+UERadioCapabilityForPagingOfNR ::= OCTET STRING
+
+UERadioCapabilityForPagingOfEUTRA ::= OCTET STRING
 
 UERANPagingIdentity ::= CHOICE {
 	i-RNTI-full			BIT STRING ( SIZE (40)),
diff --git a/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn b/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
index 7487161de5..0b45baf790 100644
--- a/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V15.3.0 (2019-03)
+-- 3GPP TS 38.423 V15.4.0 (2019-07)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -24,7 +24,7 @@ IMPORTS
 
 	ActivationIDforCellActivation,
 	ActivationIDforCellActivation,
-	AMF-Set-Information,
+	AMF-Region-Information,
 	AMF-UE-NGAP-ID,
 	AS-SecurityInformation,
 	AssistanceDataForRANPaging,
@@ -52,6 +52,7 @@ IMPORTS
 	GlobalNG-RANNode-ID,
 	GlobalNG-RANCell-ID,
 	GUAMI,
+	InterfaceInstanceIndication,
 	I-RNTI,
 	LocationInformationSNReporting,
 	LocationReportingInformation,
@@ -67,6 +68,7 @@ IMPORTS
 	NG-RAN-Cell-Identity,
 	NG-RANnodeUEXnAPID,
 	NR-CGI,
+	NE-DC-TDM-Pattern,
 	PagingDRX,
 	PagingPriority,
 	PLMN-Identity,
@@ -125,11 +127,13 @@ IMPORTS
 	UEContextKeptIndicator,
 	UEHistoryInformation,
 	UEIdentityIndexValue,
+	UERadioCapabilityForPaging,
 	UERANPagingIdentity,
 	UESecurityCapabilities,
 	UPTransportLayerInformation,
 	UserPlaneTrafficActivityReport,
-	XnBenefitValue
+	XnBenefitValue,
+	RANPagingFailure
 
 
 FROM XnAP-IEs
@@ -151,7 +155,9 @@ FROM XnAP-Containers
 	id-ActivatedServedCells,
 	id-ActivationIDforCellActivation,
 	id-AdditionalDRBIDs,
-	id-AMF-Set-Information,
+	id-AMF-Region-Information,
+	id-AMF-Region-Information-To-Add,
+	id-AMF-Region-Information-To-Delete,
 	id-AssistanceDataForRANPaging,
 	id-AvailableDRBIDs,
 	id-Cause,
@@ -190,7 +196,6 @@ FROM XnAP-Containers
 	id-PDUSessionResourcesNotifyList,
 	id-PDUSessionToBeAddedAddReq,
 	id-PDUSessionToBeReleased-RelReqAck,
-	id-PDUSession-List-withDataForwardingRequest,
 	id-RANPagingArea,
 	id-requestedSplitSRB,
 	id-RequiredNumberOfDRBIDs,
@@ -264,6 +269,13 @@ FROM XnAP-Containers
 	id-target-S-NG-RANnodeID,
 	id-S-NSSAI,
 	id-MR-DC-ResourceCoordinationInfo,
+	id-RANPagingFailure,
+	id-UERadioCapabilityForPaging,
+	id-PDUSessionDataForwarding-SNModResponse,
+	id-Secondary-MN-Xn-U-TNLInfoatM,
+	id-NE-DC-TDM-Pattern,
+	id-InterfaceInstanceIndication,
+
 
 	maxnoofCellsinNG-RANnode,
 	maxnoofDRBs,
@@ -440,7 +452,8 @@ RANPaging-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-PagingDRX							CRITICALITY ignore		TYPE PagingDRX										PRESENCE mandatory}|
 	{ ID id-RANPagingArea						CRITICALITY reject		TYPE RANPagingArea									PRESENCE mandatory}|
 	{ ID id-PagingPriority						CRITICALITY ignore		TYPE PagingPriority									PRESENCE optional }|
-	{ ID id-AssistanceDataForRANPaging			CRITICALITY ignore		TYPE AssistanceDataForRANPaging					PRESENCE optional },
+	{ ID id-AssistanceDataForRANPaging			CRITICALITY ignore		TYPE AssistanceDataForRANPaging					PRESENCE optional }|
+	{ ID id-UERadioCapabilityForPaging			CRITICALITY ignore		TYPE UERadioCapabilityForPaging					PRESENCE optional	},
 	...
 }
 
@@ -513,7 +526,7 @@ RetrieveUEContextFailure-IEs XNAP-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
--- XN-U FORWARDING ADDRESS INDICATION
+-- XN-U ADDRESS INDICATION
 --
 -- **************************************************************
 
@@ -565,8 +578,9 @@ SNodeAdditionRequest-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-S-NG-RANnodeMaxIPDataRate-UL		CRITICALITY reject		TYPE BitRate										PRESENCE optional }|
 	{ ID id-S-NG-RANnodeMaxIPDataRate-DL		CRITICALITY reject		TYPE BitRate										PRESENCE optional }|
 	{ ID id-LocationInformationSNReporting		CRITICALITY ignore		TYPE LocationInformationSNReporting			PRESENCE optional}|
-	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo						PRESENCE optional }|
-	{ ID id-MaskedIMEISV							CRITICALITY ignore		TYPE MaskedIMEISV									PRESENCE optional},
+	{ ID id-MR-DC-ResourceCoordinationInfo		CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo			PRESENCE optional }|
+	{ ID id-MaskedIMEISV						CRITICALITY ignore		TYPE MaskedIMEISV									PRESENCE optional}|
+	{ ID id-NE-DC-TDM-Pattern					CRITICALITY ignore		TYPE NE-DC-TDM-Pattern							PRESENCE optional},
 	...
 }
 
@@ -617,7 +631,7 @@ SNodeAdditionRequestAcknowledge-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-RRCConfigIndication					CRITICALITY reject		TYPE RRCConfigIndication						PRESENCE optional }|
 	{ ID id-CriticalityDiagnostics				CRITICALITY ignore		TYPE CriticalityDiagnostics					PRESENCE optional }|
 	{ ID id-LocationInformationSN				CRITICALITY ignore		TYPE Target-CGI									PRESENCE optional }|
-	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo						PRESENCE optional },
+	{ ID id-MR-DC-ResourceCoordinationInfo		CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo		PRESENCE optional },
 	...
 }
 
@@ -758,7 +772,9 @@ SNodeModificationRequest-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-S-NG-RANnodeMaxIPDataRate-UL			CRITICALITY reject		TYPE BitRate										PRESENCE optional }|
 	{ ID id-S-NG-RANnodeMaxIPDataRate-DL			CRITICALITY reject		TYPE BitRate										PRESENCE optional }|
 	{ ID id-LocationInformationSNReporting			CRITICALITY ignore		TYPE LocationInformationSNReporting			PRESENCE optional}|
-	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo						PRESENCE optional },
+	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo			PRESENCE optional }|
+	{ ID id-PCellID									CRITICALITY reject		TYPE GlobalNG-RANCell-ID							PRESENCE optional }|
+	{ ID id-NE-DC-TDM-Pattern						CRITICALITY ignore		TYPE NE-DC-TDM-Pattern							PRESENCE optional},
 	...
 }
 
@@ -839,18 +855,19 @@ SNodeModificationRequestAcknowledge ::= SEQUENCE {
 }
 
 SNodeModificationRequestAcknowledge-IEs XNAP-PROTOCOL-IES ::= {
-	{ ID id-M-NG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID							PRESENCE mandatory}|
-	{ ID id-S-NG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID							PRESENCE mandatory}|
-	{ ID id-PDUSessionAdmitted-SNModResponse		CRITICALITY ignore		TYPE PDUSessionAdmitted-SNModResponse		PRESENCE optional }|
-	{ ID id-PDUSessionNotAdmitted-SNModResponse		CRITICALITY ignore		TYPE PDUSessionNotAdmitted-SNModResponse	PRESENCE optional }|
+	{ ID id-M-NG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID								PRESENCE mandatory}|
+	{ ID id-S-NG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID								PRESENCE mandatory}|
+	{ ID id-PDUSessionAdmitted-SNModResponse		CRITICALITY ignore		TYPE PDUSessionAdmitted-SNModResponse			PRESENCE optional }|
+	{ ID id-PDUSessionNotAdmitted-SNModResponse		CRITICALITY ignore		TYPE PDUSessionNotAdmitted-SNModResponse		PRESENCE optional }|
 -- WS modification: define a dedicated type
---	{ ID id-SN-to-MN-Container						CRITICALITY ignore		TYPE OCTET STRING									PRESENCE optional }|
-	{ ID id-SN-to-MN-Container						CRITICALITY ignore		TYPE SN-to-MN-Container									PRESENCE optional }|
-	{ ID id-admittedSplitSRB						CRITICALITY ignore		TYPE SplitSRBsTypes									PRESENCE optional }|
-	{ ID id-admittedSplitSRBrelease					CRITICALITY ignore		TYPE SplitSRBsTypes									PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional }|
-	{ ID id-LocationInformationSN					CRITICALITY ignore		TYPE Target-CGI										PRESENCE optional }|
-	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo						PRESENCE optional },
+--	{ ID id-SN-to-MN-Container						CRITICALITY ignore		TYPE OCTET STRING										PRESENCE optional }|
+	{ ID id-SN-to-MN-Container						CRITICALITY ignore		TYPE SN-to-MN-Container										PRESENCE optional }|
+	{ ID id-admittedSplitSRB						CRITICALITY ignore		TYPE SplitSRBsTypes										PRESENCE optional }|
+	{ ID id-admittedSplitSRBrelease					CRITICALITY ignore		TYPE SplitSRBsTypes										PRESENCE optional }|
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics							PRESENCE optional }|
+	{ ID id-LocationInformationSN					CRITICALITY ignore		TYPE Target-CGI											PRESENCE optional }|
+	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo				PRESENCE optional }|
+	{ ID id-PDUSessionDataForwarding-SNModResponse	CRITICALITY ignore		TYPE PDUSessionDataForwarding-SNModResponse	PRESENCE optional },
 	...
 }
 PDUSessionAdmitted-SNModResponse ::= SEQUENCE {
@@ -919,6 +936,17 @@ PDUSessionNotAdmitted-SNModResponse-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 }
 
 
+PDUSessionDataForwarding-SNModResponse ::= SEQUENCE {
+	sn-terminated		PDUSession-List-withDataForwardingRequest,
+	iE-Extensions		ProtocolExtensionContainer { {PDUSessionDataForwarding-SNModResponse-ExtIEs} }	OPTIONAL,
+	...
+}
+
+PDUSessionDataForwarding-SNModResponse-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 
 -- **************************************************************
 --
@@ -963,7 +991,7 @@ SNodeModificationRequired-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-SpareDRBIDs								CRITICALITY ignore		TYPE DRB-List										PRESENCE optional }|
 	{ ID id-RequiredNumberOfDRBIDs					CRITICALITY ignore		TYPE DRB-Number										PRESENCE optional }|
 	{ ID id-LocationInformationSN					CRITICALITY ignore		TYPE Target-CGI										PRESENCE optional }|
-	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo						PRESENCE optional },
+	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo			PRESENCE optional },
 	...
 }
 PDUSessionToBeModifiedSNModRequired::= SEQUENCE (SIZE (1.. maxnoofPDUSessions)) OF 	PDUSessionToBeModifiedSNModRequired-Item
@@ -1015,7 +1043,7 @@ SNodeModificationConfirm-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-MN-to-SN-Container						CRITICALITY ignore		TYPE MN-to-SN-Container									PRESENCE optional }|
 	{ ID id-AdditionalDRBIDs						CRITICALITY reject		TYPE DRB-List										PRESENCE optional }|
 	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional }|
-	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo						PRESENCE optional },
+	{ ID id-MR-DC-ResourceCoordinationInfo			CRITICALITY ignore		TYPE MR-DC-ResourceCoordinationInfo			PRESENCE optional },
 	...
 }
 
@@ -1108,14 +1136,13 @@ SNodeReleaseRequestAcknowledge ::= SEQUENCE {
 SNodeReleaseRequestAcknowledge-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-M-NG-RANnodeUEXnAPID						CRITICALITY reject		TYPE NG-RANnodeUEXnAPID									PRESENCE mandatory}|
 	{ ID id-S-NG-RANnodeUEXnAPID						CRITICALITY reject		TYPE NG-RANnodeUEXnAPID									PRESENCE optional }|
-	{ ID id-PDUSession-List-withDataForwardingRequest	CRITICALITY ignore		TYPE PDUSession-List-withDataForwardingRequest	PRESENCE optional }|
 	{ ID id-PDUSessionToBeReleased-RelReqAck			CRITICALITY ignore		TYPE PDUSessionToBeReleasedList-RelReqAck			PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics						CRITICALITY ignore		TYPE CriticalityDiagnostics							PRESENCE optional },
 	...
 }
 
 PDUSessionToBeReleasedList-RelReqAck ::= SEQUENCE {
-	pduSessionsToBeReleasedList-SNterminated		PDUSession-List-withDataForwardingFromTarget												OPTIONAL,
+	pduSessionsToBeReleasedList-SNterminated		PDUSession-List-withDataForwardingRequest												OPTIONAL,
 	iE-Extensions									ProtocolExtensionContainer { {PDUSessionToBeReleasedList-RelReqAck-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -1418,7 +1445,8 @@ ActivityNotification-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-M-NG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID							PRESENCE mandatory}|
 	{ ID id-S-NG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID							PRESENCE mandatory}|
 	{ ID id-UserPlaneTrafficActivityReport			CRITICALITY ignore		TYPE UserPlaneTrafficActivityReport			PRESENCE optional }|
-	{ ID id-PDUSessionResourcesActivityNotifyList	CRITICALITY ignore		TYPE PDUSessionResourcesActivityNotifyList	PRESENCE optional },
+	{ ID id-PDUSessionResourcesActivityNotifyList	CRITICALITY ignore		TYPE PDUSessionResourcesActivityNotifyList	PRESENCE optional }|
+	{ ID id-RANPagingFailure						CRITICALITY ignore		TYPE RANPagingFailure								PRESENCE optional },
 	...
 }
 
@@ -1463,9 +1491,10 @@ XnSetupRequest ::= SEQUENCE {
 XnSetupRequest-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-GlobalNG-RAN-node-ID		CRITICALITY reject	TYPE GlobalNG-RANNode-ID			PRESENCE mandatory}|
 	{ ID id-TAISupport-list				CRITICALITY reject	TYPE TAISupport-List				PRESENCE mandatory}|
-	{ ID id-AMF-Set-Information			CRITICALITY reject	TYPE AMF-Set-Information			PRESENCE mandatory}|
+	{ ID id-AMF-Region-Information		CRITICALITY reject	TYPE AMF-Region-Information			PRESENCE mandatory}|
 	{ ID id-List-of-served-cells-NR		CRITICALITY reject	TYPE ServedCells-NR					PRESENCE optional }|
-	{ ID id-List-of-served-cells-E-UTRA	CRITICALITY reject	TYPE ServedCells-E-UTRA				PRESENCE optional },
+	{ ID id-List-of-served-cells-E-UTRA	CRITICALITY reject	TYPE ServedCells-E-UTRA				PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication	CRITICALITY reject	TYPE InterfaceInstanceIndication	PRESENCE optional },
 	...
 }
 
@@ -1485,7 +1514,9 @@ XnSetupResponse-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-TAISupport-list				CRITICALITY reject	TYPE TAISupport-List				PRESENCE optional }|
 	{ ID id-List-of-served-cells-NR		CRITICALITY reject	TYPE ServedCells-NR					PRESENCE optional }|
 	{ ID id-List-of-served-cells-E-UTRA	CRITICALITY reject	TYPE ServedCells-E-UTRA				PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional }|
+	{ ID id-AMF-Region-Information		CRITICALITY reject	TYPE AMF-Region-Information			PRESENCE optional}|
+	{ ID id-InterfaceInstanceIndication	CRITICALITY reject	TYPE InterfaceInstanceIndication	PRESENCE optional },
 	...
 }
 
@@ -1503,7 +1534,8 @@ XnSetupFailure ::= SEQUENCE {
 XnSetupFailure-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause							PRESENCE mandatory}|
 	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait						PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication	CRITICALITY reject	TYPE InterfaceInstanceIndication	PRESENCE optional },
 	...
 }
 
@@ -1524,7 +1556,10 @@ NGRANNodeConfigurationUpdate-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-TNLA-To-Add-List						CRITICALITY ignore	TYPE TNLA-To-Add-List									PRESENCE optional }|
 	{ ID id-TNLA-To-Remove-List						CRITICALITY ignore	TYPE TNLA-To-Remove-List								PRESENCE optional }|
 	{ ID id-TNLA-To-Update-List						CRITICALITY ignore	TYPE TNLA-To-Update-List								PRESENCE optional }|
-	{ ID id-GlobalNG-RAN-node-ID					CRITICALITY reject	TYPE GlobalNG-RANNode-ID								PRESENCE optional },
+	{ ID id-GlobalNG-RAN-node-ID					CRITICALITY reject	TYPE GlobalNG-RANNode-ID								PRESENCE optional }|
+	{ ID id-AMF-Region-Information-To-Add			CRITICALITY reject	TYPE AMF-Region-Information							PRESENCE optional }|
+	{ ID id-AMF-Region-Information-To-Delete		CRITICALITY reject	TYPE AMF-Region-Information							PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject	TYPE InterfaceInstanceIndication					PRESENCE optional },
 	...
 }
 
@@ -1568,7 +1603,8 @@ NGRANNodeConfigurationUpdateAcknowledge-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-RespondingNodeTypeConfigUpdateAck	CRITICALITY ignore	TYPE RespondingNodeTypeConfigUpdateAck		PRESENCE mandatory}|
 	{ ID id-TNLA-Setup-List						CRITICALITY ignore	TYPE TNLA-Setup-List							PRESENCE optional }|
 	{ ID id-TNLA-Failed-To-Setup-List			CRITICALITY ignore	TYPE TNLA-Failed-To-Setup-List				PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics				CRITICALITY ignore	TYPE CriticalityDiagnostics						PRESENCE optional },
+	{ ID id-CriticalityDiagnostics				CRITICALITY ignore	TYPE CriticalityDiagnostics						PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication			CRITICALITY reject	TYPE InterfaceInstanceIndication				PRESENCE optional },
 	...
 }
 RespondingNodeTypeConfigUpdateAck ::= CHOICE {
@@ -1616,7 +1652,8 @@ NGRANNodeConfigurationUpdateFailure ::= SEQUENCE {
 NGRANNodeConfigurationUpdateFailure-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause							PRESENCE mandatory}|
 	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait						PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication	CRITICALITY reject	TYPE InterfaceInstanceIndication	PRESENCE optional },
 	...
 }
 
@@ -1633,7 +1670,8 @@ E-UTRA-NR-CellResourceCoordinationRequest ::= SEQUENCE {
 }
 
 E-UTRA-NR-CellResourceCoordinationRequest-IEs XNAP-PROTOCOL-IES ::= {
-{ ID id-initiatingNodeType-ResourceCoordRequest  CRITICALITY reject  TYPE InitiatingNodeType-ResourceCoordRequest  PRESENCE mandatory},
+	{ ID id-initiatingNodeType-ResourceCoordRequest	CRITICALITY reject	TYPE InitiatingNodeType-ResourceCoordRequest		PRESENCE mandatory}|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject	TYPE InterfaceInstanceIndication						PRESENCE optional },
 	...
 }
 
@@ -1686,7 +1724,8 @@ E-UTRA-NR-CellResourceCoordinationResponse::= SEQUENCE {
 }
 
 E-UTRA-NR-CellResourceCoordinationResponse-IEs XNAP-PROTOCOL-IES ::= {
-{ ID id-respondingNodeType-ResourceCoordResponse  CRITICALITY reject  TYPE RespondingNodeType-ResourceCoordResponse PRESENCE mandatory},
+	{ ID id-respondingNodeType-ResourceCoordResponse  CRITICALITY reject  	TYPE RespondingNodeType-ResourceCoordResponse 	PRESENCE mandatory}|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject	TYPE InterfaceInstanceIndication						PRESENCE optional },
 	...
 }
 
@@ -1757,7 +1796,8 @@ XnRemovalRequest ::= SEQUENCE {
 
 XnRemovalRequest-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-GlobalNG-RAN-node-ID		CRITICALITY reject	TYPE GlobalNG-RANNode-ID			PRESENCE mandatory}|
-	{ ID id-XnRemovalThreshold			CRITICALITY reject	TYPE XnBenefitValue					PRESENCE optional },
+	{ ID id-XnRemovalThreshold			CRITICALITY reject	TYPE XnBenefitValue					PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication	CRITICALITY reject	TYPE InterfaceInstanceIndication	PRESENCE optional },
 	...
 }
 
@@ -1774,7 +1814,8 @@ XnRemovalResponse ::= SEQUENCE {
 
 XnRemovalResponse-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-GlobalNG-RAN-node-ID		CRITICALITY reject	TYPE GlobalNG-RANNode-ID			PRESENCE mandatory}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication	CRITICALITY reject	TYPE InterfaceInstanceIndication	PRESENCE optional },
 	...
 }
 
@@ -1791,7 +1832,8 @@ XnRemovalFailure ::= SEQUENCE {
 
 XnRemovalFailure-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause							PRESENCE mandatory}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication	CRITICALITY reject	TYPE InterfaceInstanceIndication	PRESENCE optional },
 	...
 }
 
@@ -1808,7 +1850,8 @@ CellActivationRequest ::= SEQUENCE {
 
 CellActivationRequest-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-ServedCellsToActivate					CRITICALITY reject		TYPE ServedCellsToActivate						PRESENCE mandatory}|
-	{ ID id-ActivationIDforCellActivation			CRITICALITY reject		TYPE ActivationIDforCellActivation			PRESENCE mandatory},
+	{ ID id-ActivationIDforCellActivation			CRITICALITY reject		TYPE ActivationIDforCellActivation			PRESENCE mandatory}|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject		TYPE InterfaceInstanceIndication				PRESENCE optional },
 	...
 }
 
@@ -1837,7 +1880,8 @@ CellActivationResponse ::= SEQUENCE {
 CellActivationResponse-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-ActivatedServedCells					CRITICALITY reject		TYPE ActivatedServedCells						PRESENCE mandatory}|
 	{ ID id-ActivationIDforCellActivation			CRITICALITY reject		TYPE ActivationIDforCellActivation			PRESENCE mandatory}|
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional },
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication			CRITICALITY reject		TYPE InterfaceInstanceIndication				PRESENCE optional },
 	...
 }
 
@@ -1866,7 +1910,8 @@ CellActivationFailure ::= SEQUENCE {
 CellActivationFailure-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-ActivationIDforCellActivation			CRITICALITY reject		TYPE ActivationIDforCellActivation			PRESENCE mandatory}|
 	{ ID id-Cause									CRITICALITY ignore		TYPE Cause											PRESENCE mandatory}|
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional },
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject		TYPE InterfaceInstanceIndication				PRESENCE optional },
 	...
 }
 
@@ -1883,7 +1928,8 @@ ResetRequest ::= SEQUENCE {
 
 ResetRequest-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-ResetRequestTypeInfo					CRITICALITY reject		TYPE ResetRequestTypeInfo						PRESENCE mandatory}|
-	{ ID id-Cause									CRITICALITY ignore		TYPE Cause											PRESENCE mandatory},
+	{ ID id-Cause									CRITICALITY ignore		TYPE Cause											PRESENCE mandatory}|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject		TYPE InterfaceInstanceIndication				PRESENCE optional },
 	...
 }
 
@@ -1900,7 +1946,8 @@ ResetResponse ::= SEQUENCE {
 
 ResetResponse-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-ResetResponseTypeInfo					CRITICALITY reject		TYPE ResetResponseTypeInfo						PRESENCE mandatory}|
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional },
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject		TYPE InterfaceInstanceIndication				PRESENCE optional },
 	...
 }
 
@@ -1919,7 +1966,8 @@ ErrorIndication-IEs XNAP-PROTOCOL-IES ::= {
 	{ ID id-oldNG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID							PRESENCE optional }|
 	{ ID id-newNG-RANnodeUEXnAPID					CRITICALITY ignore		TYPE NG-RANnodeUEXnAPID							PRESENCE optional }|
 	{ ID id-Cause									CRITICALITY ignore		TYPE Cause											PRESENCE optional }|
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional },
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore		TYPE CriticalityDiagnostics						PRESENCE optional }|
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject		TYPE InterfaceInstanceIndication				PRESENCE optional },
 	...
 }
 
diff --git a/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn b/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
index 9914d22e93..a9ac9bc4b1 100644
--- a/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V15.3.0 (2019-03)
+-- 3GPP TS 38.423 V15.4.0 (2019-07)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/xnap/packet-xnap-template.c b/epan/dissectors/asn1/xnap/packet-xnap-template.c
index 90efb668df..c843c26f00 100644
--- a/epan/dissectors/asn1/xnap/packet-xnap-template.c
+++ b/epan/dissectors/asn1/xnap/packet-xnap-template.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 38.423 V15.3.0 (2019-03)
+ * 3GPP TS 38.423 V15.4.0 (2019-07)
  */
 
 #include "config.h"
@@ -65,6 +65,8 @@ static gint ett_xnap_LastVisitedEUTRANCellInformation = -1;
 static gint ett_xnap_LastVisitedNGRANCellInformation = -1;
 static gint ett_xnap_LastVisitedUTRANCellInformation = -1;
 static gint ett_xnap_LastVisitedGERANCellInformation = -1;
+static gint ett_xnap_UERadioCapabilityForPagingOfNR = -1;
+static gint ett_xnap_UERadioCapabilityForPagingOfEUTRA = -1;
 #include "packet-xnap-ett.c"
 
 enum {
@@ -269,6 +271,8 @@ void proto_register_xnap(void) {
     &ett_xnap_LastVisitedNGRANCellInformation,
     &ett_xnap_LastVisitedUTRANCellInformation,
     &ett_xnap_LastVisitedGERANCellInformation,
+    &ett_xnap_UERadioCapabilityForPagingOfNR,
+    &ett_xnap_UERadioCapabilityForPagingOfEUTRA,
 #include "packet-xnap-ettarr.c"
   };
 
diff --git a/epan/dissectors/asn1/xnap/xnap.cnf b/epan/dissectors/asn1/xnap/xnap.cnf
index 7df6ac4fe9..d61936c951 100644
--- a/epan/dissectors/asn1/xnap/xnap.cnf
+++ b/epan/dissectors/asn1/xnap/xnap.cnf
@@ -421,6 +421,24 @@ VolumeTimedReport-Item/usageCountUL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u
 #.TYPE_ATTR
 VolumeTimedReport-Item/usageCountDL DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_octet_octets
 
+#.FN_BODY UERadioCapabilityForPagingOfNR VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_UERadioCapabilityForPagingOfNR);
+    dissect_nr_rrc_UERadioPagingInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY UERadioCapabilityForPagingOfEUTRA VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_UERadioCapabilityForPagingOfEUTRA);
+    dissect_lte_rrc_UERadioPagingInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
 #.END
 
 #.FN_HDR HandoverRequest
@@ -563,7 +581,7 @@ id-ActivatedServedCells                       ProtocolIE-ID
 id-ActivationIDforCellActivation              ProtocolIE-ID
 id-admittedSplitSRB                           ProtocolIE-ID
 id-admittedSplitSRBrelease                    ProtocolIE-ID
-id-AMF-Set-Information                        ProtocolIE-ID
+id-AMF-Region-Information                     ProtocolIE-ID
 id-AssistanceDataForRANPaging                 ProtocolIE-ID
 id-BearersSubjectToCounterCheck               ProtocolIE-ID
 id-Cause                                      ProtocolIE-ID
@@ -665,7 +683,6 @@ id-TNLA-Setup-List                            ProtocolIE-ID
 id-TNLA-Failed-To-Setup-List                  ProtocolIE-ID
 id-PDUSessionToBeReleased-RelReqAck           ProtocolIE-ID
 id-S-NG-RANnodeMaxIPDataRate-UL               ProtocolIE-ID
-id-PDUSession-List-withDataForwardingRequest  ProtocolIE-ID
 id-PDUSessionResourceSecondaryRATUsageList    ProtocolIE-ID
 id-Additional-UL-NG-U-TNLatUPF-List           ProtocolIE-ID
 id-SecondarydataForwardingInfoFromTarget-List ProtocolIE-ID
@@ -677,6 +694,19 @@ id-MaxIPrate-DL                               ProtocolIE-ID
 id-SecurityResult                             ProtocolIE-ID
 id-S-NSSAI                                    ProtocolIE-ID
 id-MR-DC-ResourceCoordinationInfo             ProtocolIE-ID
+id-AMF-Region-Information-To-Add              ProtocolIE-ID
+id-AMF-Region-Information-To-Delete           ProtocolIE-ID
+id-OldQoSFlowMap-ULendmarkerexpected          ProtocolIE-ID
+id-RANPagingFailure                           ProtocolIE-ID
+id-UERadioCapabilityForPaging                 ProtocolIE-ID
+id-PDUSessionDataForwarding-SNModResponse     ProtocolIE-ID
+id-DRBsNotAdmittedSetupModifyList             ProtocolIE-ID
+id-Secondary-MN-Xn-U-TNLInfoatM               ProtocolIE-ID
+id-NE-DC-TDM-Pattern                          ProtocolIE-ID
+id-PDUSessionCommonNetworkInstance            ProtocolIE-ID
+id-BPLMN-ID-Info-EUTRA                        ProtocolIE-ID
+id-BPLMN-ID-Info-NR                           ProtocolIE-ID
+id-InterfaceInstanceIndication                ProtocolIE-ID
 
 #.REGISTER
 
@@ -685,7 +715,7 @@ ActivatedServedCells                              N xnap.ies id-ActivatedServedC
 ActivationIDforCellActivation                     N xnap.ies id-ActivationIDforCellActivation
 SplitSRBsTypes                                    N xnap.ies id-admittedSplitSRB
 SplitSRBsTypes                                    N xnap.ies id-admittedSplitSRBrelease
-AMF-Set-Information                               N xnap.ies id-AMF-Set-Information
+AMF-Region-Information                            N xnap.ies id-AMF-Region-Information
 AssistanceDataForRANPaging                        N xnap.ies id-AssistanceDataForRANPaging
 BearersSubjectToCounterCheck-List                 N xnap.ies id-BearersSubjectToCounterCheck
 Cause                                             N xnap.ies id-Cause
@@ -787,12 +817,18 @@ TNLA-Setup-List                                   N xnap.ies id-TNLA-Setup-List
 TNLA-Failed-To-Setup-List                         N xnap.ies id-TNLA-Failed-To-Setup-List
 PDUSessionToBeReleasedList-RelReqAck              N xnap.ies id-PDUSessionToBeReleased-RelReqAck
 BitRate                                           N xnap.ies id-S-NG-RANnodeMaxIPDataRate-UL
-PDUSession-List-withDataForwardingRequest         N xnap.ies id-PDUSession-List-withDataForwardingRequest
 PDUSessionResourceSecondaryRATUsageList           N xnap.ies id-PDUSessionResourceSecondaryRATUsageList
 LocationInformationSNReporting                    N xnap.ies id-LocationInformationSNReporting
 Target-CGI                                        N xnap.ies id-LocationInformationSN
 BitRate                                           N xnap.ies id-S-NG-RANnodeMaxIPDataRate-DL
 MR-DC-ResourceCoordinationInfo                    N xnap.ies id-MR-DC-ResourceCoordinationInfo
+AMF-Region-Information                            N xnap.ies id-AMF-Region-Information-To-Add
+AMF-Region-Information                            N xnap.ies id-AMF-Region-Information-To-Delete
+RANPagingFailure                                  N xnap.ies id-RANPagingFailure
+UERadioCapabilityForPaging                        N xnap.ies id-UERadioCapabilityForPaging
+PDUSessionDataForwarding-SNModResponse            N xnap.ies id-PDUSessionDataForwarding-SNModResponse
+NE-DC-TDM-Pattern                                 N xnap.ies id-NE-DC-TDM-Pattern
+InterfaceInstanceIndication                       N xnap.ies id-InterfaceInstanceIndication
 
 #XNAP-PROTOCOL-EXTENSION
 Additional-UL-NG-U-TNLatUPF-List                  N xnap.extension id-Additional-UL-NG-U-TNLatUPF-List
@@ -801,6 +837,12 @@ PLMN-Identity                                     N xnap.extension id-LastE-UTRA
 MaxIPrate                                         N xnap.extension id-MaxIPrate-DL
 SecurityResult                                    N xnap.extension id-SecurityResult
 S-NSSAI                                           N xnap.extension id-S-NSSAI
+QoSFlows-List                                     N xnap.extension id-OldQoSFlowMap-ULendmarkerexpected
+DRB-List-withCause                                N xnap.extension id-DRBsNotAdmittedSetupModifyList
+UPTransportLayerInformation                       N xnap.extension id-Secondary-MN-Xn-U-TNLInfoatM
+PDUSessionCommonNetworkInstance                   N xnap.extension id-PDUSessionCommonNetworkInstance
+BPLMN-ID-Info-EUTRA                               N xnap.extension id-BPLMN-ID-Info-EUTRA
+BPLMN-ID-Info-NR                                  N xnap.extension id-BPLMN-ID-Info-NR
 
 #XNAP-ELEMENTARY-PROCEDURE
 HandoverRequest                            N xnap.proc.imsg id-handoverPreparation
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 9aadca03d9..7107501ea4 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -307,7 +307,7 @@ static int hf_lte_rrc_lte_rrc_SCG_Config_r12_PDU = -1;  /* SCG_Config_r12 */
 static int hf_lte_rrc_lte_rrc_SCG_ConfigInfo_r12_PDU = -1;  /* SCG_ConfigInfo_r12 */
 static int hf_lte_rrc_lte_rrc_UEPagingCoverageInformation_PDU = -1;  /* UEPagingCoverageInformation */
 static int hf_lte_rrc_UERadioAccessCapabilityInformation_PDU = -1;  /* UERadioAccessCapabilityInformation */
-static int hf_lte_rrc_UERadioPagingInformation_PDU = -1;  /* UERadioPagingInformation */
+static int hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU = -1;  /* UERadioPagingInformation */
 static int hf_lte_rrc_BCCH_BCH_Message_PDU = -1;  /* BCCH_BCH_Message */
 static int hf_lte_rrc_BCCH_BCH_Message_MBMS_PDU = -1;  /* BCCH_BCH_Message_MBMS */
 static int hf_lte_rrc_BCCH_DL_SCH_Message_PDU = -1;  /* BCCH_DL_SCH_Message */
@@ -110827,13 +110827,13 @@ static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, pac
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+int dissect_lte_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
   int offset = 0;
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
-  offset = dissect_lte_rrc_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UERadioPagingInformation_PDU);
+  offset = dissect_lte_rrc_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -111902,7 +111902,7 @@ void proto_register_lte_rrc(void) {
       { "UERadioAccessCapabilityInformation", "lte-rrc.UERadioAccessCapabilityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_lte_rrc_UERadioPagingInformation_PDU,
+    { &hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU,
       { "UERadioPagingInformation", "lte-rrc.UERadioPagingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
@@ -145369,7 +145369,7 @@ void proto_register_lte_rrc(void) {
 /*--- Included file: packet-lte-rrc-dis-reg.c ---*/
 #line 1 "./asn1/lte-rrc/packet-lte-rrc-dis-reg.c"
   register_dissector("lte-rrc.ue_radio_access_cap_info", dissect_UERadioAccessCapabilityInformation_PDU, proto_lte_rrc);
-  register_dissector("lte-rrc.ue_radio_paging_info", dissect_UERadioPagingInformation_PDU, proto_lte_rrc);
+  register_dissector("lte-rrc.ue_radio_paging_info", dissect_lte_rrc_UERadioPagingInformation_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.bch", dissect_BCCH_BCH_Message_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.bch.mbms", dissect_BCCH_BCH_Message_MBMS_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.dl.sch", dissect_BCCH_DL_SCH_Message_PDU, proto_lte_rrc);
diff --git a/epan/dissectors/packet-lte-rrc.h b/epan/dissectors/packet-lte-rrc.h
index 9165e9af72..92b1c9dff0 100644
--- a/epan/dissectors/packet-lte-rrc.h
+++ b/epan/dissectors/packet-lte-rrc.h
@@ -29,6 +29,7 @@ int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet
 int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
+int dissect_lte_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_RRCConnectionReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c
index b96d6fba61..cea00caa12 100644
--- a/epan/dissectors/packet-nr-rrc.c
+++ b/epan/dissectors/packet-nr-rrc.c
@@ -261,7 +261,7 @@ static int hf_nr_rrc_nr_rrc_CG_ConfigInfo_PDU = -1;  /* CG_ConfigInfo */
 static int hf_nr_rrc_nr_rrc_ConfigRestrictInfoSCG_PDU = -1;  /* ConfigRestrictInfoSCG */
 static int hf_nr_rrc_nr_rrc_FeatureSetEntryIndex_PDU = -1;  /* FeatureSetEntryIndex */
 static int hf_nr_rrc_nr_rrc_MeasurementTimingConfiguration_PDU = -1;  /* MeasurementTimingConfiguration */
-static int hf_nr_rrc_UERadioPagingInformation_PDU = -1;  /* UERadioPagingInformation */
+static int hf_nr_rrc_nr_rrc_UERadioPagingInformation_PDU = -1;  /* UERadioPagingInformation */
 static int hf_nr_rrc_UERadioAccessCapabilityInformation_PDU = -1;  /* UERadioAccessCapabilityInformation */
 static int hf_nr_rrc_BCCH_BCH_Message_PDU = -1;   /* BCCH_BCH_Message */
 static int hf_nr_rrc_BCCH_DL_SCH_Message_PDU = -1;  /* BCCH_DL_SCH_Message */
@@ -43602,13 +43602,13 @@ int dissect_nr_rrc_MeasurementTimingConfiguration_PDU(tvbuff_t *tvb _U_, packet_
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+int dissect_nr_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   proto_item *prot_ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
   int offset = 0;
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
-  offset = dissect_nr_rrc_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_UERadioPagingInformation_PDU);
+  offset = dissect_nr_rrc_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_nr_rrc_UERadioPagingInformation_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -44056,7 +44056,7 @@ proto_register_nr_rrc(void) {
       { "MeasurementTimingConfiguration", "nr-rrc.MeasurementTimingConfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_nr_rrc_UERadioPagingInformation_PDU,
+    { &hf_nr_rrc_nr_rrc_UERadioPagingInformation_PDU,
       { "UERadioPagingInformation", "nr-rrc.UERadioPagingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
@@ -57333,7 +57333,7 @@ proto_register_nr_rrc(void) {
 
 /*--- Included file: packet-nr-rrc-dis-reg.c ---*/
 #line 1 "./asn1/nr-rrc/packet-nr-rrc-dis-reg.c"
-  register_dissector("nr-rrc.ue_radio_paging_info", dissect_UERadioPagingInformation_PDU, proto_nr_rrc);
+  register_dissector("nr-rrc.ue_radio_paging_info", dissect_nr_rrc_UERadioPagingInformation_PDU, proto_nr_rrc);
   register_dissector("nr-rrc.ue_radio_access_cap_info", dissect_UERadioAccessCapabilityInformation_PDU, proto_nr_rrc);
   register_dissector("nr-rrc.bcch.bch", dissect_BCCH_BCH_Message_PDU, proto_nr_rrc);
   register_dissector("nr-rrc.bcch.dl.sch", dissect_BCCH_DL_SCH_Message_PDU, proto_nr_rrc);
diff --git a/epan/dissectors/packet-nr-rrc.h b/epan/dissectors/packet-nr-rrc.h
index 76e9081664..09e7c7d629 100644
--- a/epan/dissectors/packet-nr-rrc.h
+++ b/epan/dissectors/packet-nr-rrc.h
@@ -32,6 +32,7 @@ int dissect_nr_rrc_CG_ConfigInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 int dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_nr_rrc_FeatureSetEntryIndex_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_nr_rrc_MeasurementTimingConfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
+int dissect_nr_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_nr_rrc_UL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_nr_rrc_MIB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_nr_rrc_RRCReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
diff --git a/epan/dissectors/packet-xnap.c b/epan/dissectors/packet-xnap.c
index 68d8ac3cb1..a3465a9338 100644
--- a/epan/dissectors/packet-xnap.c
+++ b/epan/dissectors/packet-xnap.c
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 38.423 V15.3.0 (2019-03)
+ * 3GPP TS 38.423 V15.4.0 (2019-07)
  */
 
 #include "config.h"
@@ -59,7 +59,7 @@
 #define maxProtocolIEs                 65535
 #define maxEARFCN                      262143
 #define maxnoofAllowedAreas            16
-#define maxnoofAMFSets                 16
+#define maxnoofAMFRegions              16
 #define maxnoofAoIs                    64
 #define maxnoofBPLMNs                  12
 #define maxnoofCellsinAoI              256
@@ -69,6 +69,7 @@
 #define maxnoofCellsUEMovingTrajectory 16
 #define maxnoofDRBs                    32
 #define maxnoofEUTRABands              16
+#define maxnoofEUTRABPLMNs             6
 #define maxnoofEPLMNs                  15
 #define maxnoofForbiddenTACs           4096
 #define maxnoofMBSFNEUTRA              8
@@ -130,7 +131,7 @@ typedef enum _ProtocolIE_ID_enum {
   id_ActivationIDforCellActivation =   1,
   id_admittedSplitSRB =   2,
   id_admittedSplitSRBrelease =   3,
-  id_AMF_Set_Information =   4,
+  id_AMF_Region_Information =   4,
   id_AssistanceDataForRANPaging =   5,
   id_BearersSubjectToCounterCheck =   6,
   id_Cause     =   7,
@@ -232,7 +233,7 @@ typedef enum _ProtocolIE_ID_enum {
   id_TNLA_Failed_To_Setup_List = 103,
   id_PDUSessionToBeReleased_RelReqAck = 104,
   id_S_NG_RANnodeMaxIPDataRate_UL = 105,
-  id_PDUSession_List_withDataForwardingRequest = 106,
+  id_Unknown_106 = 106,
   id_PDUSessionResourceSecondaryRATUsageList = 107,
   id_Additional_UL_NG_U_TNLatUPF_List = 108,
   id_SecondarydataForwardingInfoFromTarget_List = 109,
@@ -243,7 +244,20 @@ typedef enum _ProtocolIE_ID_enum {
   id_MaxIPrate_DL = 114,
   id_SecurityResult = 115,
   id_S_NSSAI   = 116,
-  id_MR_DC_ResourceCoordinationInfo = 117
+  id_MR_DC_ResourceCoordinationInfo = 117,
+  id_AMF_Region_Information_To_Add = 118,
+  id_AMF_Region_Information_To_Delete = 119,
+  id_OldQoSFlowMap_ULendmarkerexpected = 120,
+  id_RANPagingFailure = 121,
+  id_UERadioCapabilityForPaging = 122,
+  id_PDUSessionDataForwarding_SNModResponse = 123,
+  id_DRBsNotAdmittedSetupModifyList = 124,
+  id_Secondary_MN_Xn_U_TNLInfoatM = 125,
+  id_NE_DC_TDM_Pattern = 126,
+  id_PDUSessionCommonNetworkInstance = 127,
+  id_BPLMN_ID_Info_EUTRA = 128,
+  id_BPLMN_ID_Info_NR = 129,
+  id_InterfaceInstanceIndication = 130
 } ProtocolIE_ID_enum;
 
 typedef enum _GlobalNG_RANNode_ID_enum {
@@ -266,8 +280,10 @@ static int hf_xnap_ng_ran_TraceID_TraceRecordingSessionReference = -1;
 #line 1 "./asn1/xnap/packet-xnap-hf.c"
 static int hf_xnap_Additional_UL_NG_U_TNLatUPF_List_PDU = -1;  /* Additional_UL_NG_U_TNLatUPF_List */
 static int hf_xnap_ActivationIDforCellActivation_PDU = -1;  /* ActivationIDforCellActivation */
-static int hf_xnap_AMF_Set_Information_PDU = -1;  /* AMF_Set_Information */
+static int hf_xnap_AMF_Region_Information_PDU = -1;  /* AMF_Region_Information */
 static int hf_xnap_AssistanceDataForRANPaging_PDU = -1;  /* AssistanceDataForRANPaging */
+static int hf_xnap_BPLMN_ID_Info_EUTRA_PDU = -1;  /* BPLMN_ID_Info_EUTRA */
+static int hf_xnap_BPLMN_ID_Info_NR_PDU = -1;     /* BPLMN_ID_Info_NR */
 static int hf_xnap_BitRate_PDU = -1;              /* BitRate */
 static int hf_xnap_Cause_PDU = -1;                /* Cause */
 static int hf_xnap_CellAssistanceInfo_NR_PDU = -1;  /* CellAssistanceInfo_NR */
@@ -275,12 +291,14 @@ static int hf_xnap_CriticalityDiagnostics_PDU = -1;  /* CriticalityDiagnostics *
 static int hf_xnap_XnUAddressInfoperPDUSession_List_PDU = -1;  /* XnUAddressInfoperPDUSession_List */
 static int hf_xnap_DesiredActNotificationLevel_PDU = -1;  /* DesiredActNotificationLevel */
 static int hf_xnap_DRB_List_PDU = -1;             /* DRB_List */
+static int hf_xnap_DRB_List_withCause_PDU = -1;   /* DRB_List_withCause */
 static int hf_xnap_DRB_Number_PDU = -1;           /* DRB_Number */
 static int hf_xnap_DRBsSubjectToStatusTransfer_List_PDU = -1;  /* DRBsSubjectToStatusTransfer_List */
 static int hf_xnap_ExpectedUEBehaviour_PDU = -1;  /* ExpectedUEBehaviour */
 static int hf_xnap_GlobalNG_RANCell_ID_PDU = -1;  /* GlobalNG_RANCell_ID */
 static int hf_xnap_GlobalNG_RANNode_ID_PDU = -1;  /* GlobalNG_RANNode_ID */
 static int hf_xnap_GUAMI_PDU = -1;                /* GUAMI */
+static int hf_xnap_InterfaceInstanceIndication_PDU = -1;  /* InterfaceInstanceIndication */
 static int hf_xnap_LocationInformationSNReporting_PDU = -1;  /* LocationInformationSNReporting */
 static int hf_xnap_LocationReportingInformation_PDU = -1;  /* LocationReportingInformation */
 static int hf_xnap_MAC_I_PDU = -1;                /* MAC_I */
@@ -288,18 +306,21 @@ static int hf_xnap_MaskedIMEISV_PDU = -1;         /* MaskedIMEISV */
 static int hf_xnap_MaxIPrate_PDU = -1;            /* MaxIPrate */
 static int hf_xnap_MobilityRestrictionList_PDU = -1;  /* MobilityRestrictionList */
 static int hf_xnap_MR_DC_ResourceCoordinationInfo_PDU = -1;  /* MR_DC_ResourceCoordinationInfo */
+static int hf_xnap_NE_DC_TDM_Pattern_PDU = -1;    /* NE_DC_TDM_Pattern */
 static int hf_xnap_NG_RAN_Cell_Identity_PDU = -1;  /* NG_RAN_Cell_Identity */
 static int hf_xnap_NG_RANnodeUEXnAPID_PDU = -1;   /* NG_RANnodeUEXnAPID */
 static int hf_xnap_PagingDRX_PDU = -1;            /* PagingDRX */
 static int hf_xnap_PagingPriority_PDU = -1;       /* PagingPriority */
 static int hf_xnap_PDCPChangeIndication_PDU = -1;  /* PDCPChangeIndication */
 static int hf_xnap_PDUSession_List_withCause_PDU = -1;  /* PDUSession_List_withCause */
-static int hf_xnap_PDUSession_List_withDataForwardingRequest_PDU = -1;  /* PDUSession_List_withDataForwardingRequest */
 static int hf_xnap_PDUSessionResourcesAdmitted_List_PDU = -1;  /* PDUSessionResourcesAdmitted_List */
 static int hf_xnap_PDUSessionResourcesNotAdmitted_List_PDU = -1;  /* PDUSessionResourcesNotAdmitted_List */
 static int hf_xnap_PDUSessionResourceSecondaryRATUsageList_PDU = -1;  /* PDUSessionResourceSecondaryRATUsageList */
+static int hf_xnap_PDUSessionCommonNetworkInstance_PDU = -1;  /* PDUSessionCommonNetworkInstance */
 static int hf_xnap_PLMN_Identity_PDU = -1;        /* PLMN_Identity */
+static int hf_xnap_QoSFlows_List_PDU = -1;        /* QoSFlows_List */
 static int hf_xnap_RANPagingArea_PDU = -1;        /* RANPagingArea */
+static int hf_xnap_RANPagingFailure_PDU = -1;     /* RANPagingFailure */
 static int hf_xnap_ResetRequestTypeInfo_PDU = -1;  /* ResetRequestTypeInfo */
 static int hf_xnap_ResetResponseTypeInfo_PDU = -1;  /* ResetResponseTypeInfo */
 static int hf_xnap_RFSP_Index_PDU = -1;           /* RFSP_Index */
@@ -330,8 +351,10 @@ static int hf_xnap_UEContextID_PDU = -1;          /* UEContextID */
 static int hf_xnap_UEContextInfoRetrUECtxtResp_PDU = -1;  /* UEContextInfoRetrUECtxtResp */
 static int hf_xnap_UEHistoryInformation_PDU = -1;  /* UEHistoryInformation */
 static int hf_xnap_UEIdentityIndexValue_PDU = -1;  /* UEIdentityIndexValue */
+static int hf_xnap_UERadioCapabilityForPaging_PDU = -1;  /* UERadioCapabilityForPaging */
 static int hf_xnap_UERANPagingIdentity_PDU = -1;  /* UERANPagingIdentity */
 static int hf_xnap_UESecurityCapabilities_PDU = -1;  /* UESecurityCapabilities */
+static int hf_xnap_UPTransportLayerInformation_PDU = -1;  /* UPTransportLayerInformation */
 static int hf_xnap_UserPlaneTrafficActivityReport_PDU = -1;  /* UserPlaneTrafficActivityReport */
 static int hf_xnap_XnBenefitValue_PDU = -1;       /* XnBenefitValue */
 static int hf_xnap_HandoverRequest_PDU = -1;      /* HandoverRequest */
@@ -364,6 +387,7 @@ static int hf_xnap_UEContextInfo_SNModRequest_PDU = -1;  /* UEContextInfo_SNModR
 static int hf_xnap_SNodeModificationRequestAcknowledge_PDU = -1;  /* SNodeModificationRequestAcknowledge */
 static int hf_xnap_PDUSessionAdmitted_SNModResponse_PDU = -1;  /* PDUSessionAdmitted_SNModResponse */
 static int hf_xnap_PDUSessionNotAdmitted_SNModResponse_PDU = -1;  /* PDUSessionNotAdmitted_SNModResponse */
+static int hf_xnap_PDUSessionDataForwarding_SNModResponse_PDU = -1;  /* PDUSessionDataForwarding_SNModResponse */
 static int hf_xnap_SNodeModificationRequestReject_PDU = -1;  /* SNodeModificationRequestReject */
 static int hf_xnap_SNodeModificationRequired_PDU = -1;  /* SNodeModificationRequired */
 static int hf_xnap_PDUSessionToBeModifiedSNModRequired_PDU = -1;  /* PDUSessionToBeModifiedSNModRequired */
@@ -438,10 +462,9 @@ static int hf_xnap_Additional_UL_NG_U_TNLatUPF_List_item = -1;  /* Additional_UL
 static int hf_xnap_priorityLevel = -1;            /* INTEGER_0_15_ */
 static int hf_xnap_pre_emption_capability = -1;   /* T_pre_emption_capability */
 static int hf_xnap_pre_emption_vulnerability = -1;  /* T_pre_emption_vulnerability */
-static int hf_xnap_AMF_Set_Information_item = -1;  /* GlobalAMF_Set_Information */
+static int hf_xnap_AMF_Region_Information_item = -1;  /* GlobalAMF_Region_Information */
 static int hf_xnap_plmn_ID = -1;                  /* PLMN_Identity */
 static int hf_xnap_amf_region_id = -1;            /* BIT_STRING_SIZE_8 */
-static int hf_xnap_amf_set_id = -1;               /* BIT_STRING_SIZE_10 */
 static int hf_xnap_AreaOfInterestInformation_item = -1;  /* AreaOfInterest_Item */
 static int hf_xnap_listOfTAIsinAoI = -1;          /* ListOfTAIsinAoI */
 static int hf_xnap_listOfCellsinAoI = -1;         /* ListOfCells */
@@ -450,10 +473,19 @@ static int hf_xnap_requestReferenceID = -1;       /* RequestReferenceID */
 static int hf_xnap_key_NG_RAN_Star = -1;          /* BIT_STRING_SIZE_256 */
 static int hf_xnap_ncc = -1;                      /* INTEGER_0_7 */
 static int hf_xnap_ran_paging_attempt_info = -1;  /* RANPagingAttemptInfo */
+static int hf_xnap_BPLMN_ID_Info_EUTRA_item = -1;  /* BPLMN_ID_Info_EUTRA_Item */
+static int hf_xnap_broadcastPLMNs = -1;           /* BroadcastEUTRAPLMNs */
+static int hf_xnap_tac = -1;                      /* TAC */
+static int hf_xnap_e_utraCI = -1;                 /* E_UTRA_Cell_Identity */
+static int hf_xnap_ranac = -1;                    /* RANAC */
+static int hf_xnap_iE_Extension = -1;             /* ProtocolExtensionContainer */
+static int hf_xnap_BPLMN_ID_Info_NR_item = -1;    /* BPLMN_ID_Info_NR_Item */
+static int hf_xnap_broadcastPLMNs_01 = -1;        /* BroadcastPLMNs */
+static int hf_xnap_nr_CI = -1;                    /* NR_Cell_Identity */
 static int hf_xnap_BroadcastPLMNs_item = -1;      /* PLMN_Identity */
+static int hf_xnap_BroadcastEUTRAPLMNs_item = -1;  /* PLMN_Identity */
 static int hf_xnap_plmn_id = -1;                  /* PLMN_Identity */
 static int hf_xnap_tAISliceSupport_List = -1;     /* SliceSupport_List */
-static int hf_xnap_iE_Extension = -1;             /* ProtocolExtensionContainer */
 static int hf_xnap_radioNetwork = -1;             /* CauseRadioNetworkLayer */
 static int hf_xnap_transport = -1;                /* CauseTransportLayer */
 static int hf_xnap_protocol = -1;                 /* CauseProtocol */
@@ -515,7 +547,6 @@ static int hf_xnap_receiveStatusofPDCPSDU_01 = -1;  /* BIT_STRING_SIZE_1_131072
 static int hf_xnap_cOUNTValue_01 = -1;            /* COUNT_PDCP_SN18 */
 static int hf_xnap_DRBToQoSFlowMapping_List_item = -1;  /* DRBToQoSFlowMapping_Item */
 static int hf_xnap_qosFlows_List = -1;            /* QoSFlows_List */
-static int hf_xnap_qosFlowMappingIndication = -1;  /* QoSFlowMappingIndication */
 static int hf_xnap_priorityLevelQoS = -1;         /* PriorityLevelQoS */
 static int hf_xnap_packetDelayBudget = -1;        /* PacketDelayBudget */
 static int hf_xnap_packetErrorRate = -1;          /* PacketErrorRate */
@@ -558,6 +589,7 @@ static int hf_xnap_gNB = -1;                      /* GlobalgNB_ID */
 static int hf_xnap_ng_eNB = -1;                   /* GlobalngeNB_ID */
 static int hf_xnap_tnl_address = -1;              /* TransportLayerAddress */
 static int hf_xnap_gtp_teid = -1;                 /* GTP_TEID */
+static int hf_xnap_amf_set_id = -1;               /* BIT_STRING_SIZE_10 */
 static int hf_xnap_amf_pointer = -1;              /* BIT_STRING_SIZE_6 */
 static int hf_xnap_i_RNTI_full = -1;              /* BIT_STRING_SIZE_40 */
 static int hf_xnap_i_RNTI_short = -1;             /* BIT_STRING_SIZE_24 */
@@ -608,12 +640,12 @@ static int hf_xnap_dl_coordination_info = -1;     /* BIT_STRING_SIZE_6_4400 */
 static int hf_xnap_nr_cell = -1;                  /* NR_CGI */
 static int hf_xnap_e_utra_coordination_assistance_info = -1;  /* E_UTRA_CoordinationAssistanceInfo */
 static int hf_xnap_nr_coordination_assistance_info = -1;  /* NR_CoordinationAssistanceInfo */
+static int hf_xnap_subframeAssignment = -1;       /* T_subframeAssignment */
+static int hf_xnap_harqOffset = -1;               /* INTEGER_0_9 */
 static int hf_xnap_NeighbourInformation_E_UTRA_item = -1;  /* NeighbourInformation_E_UTRA_Item */
 static int hf_xnap_e_utra_PCI = -1;               /* E_UTRAPCI */
 static int hf_xnap_e_utra_cgi = -1;               /* E_UTRA_CGI */
 static int hf_xnap_earfcn = -1;                   /* E_UTRAARFCN */
-static int hf_xnap_tac = -1;                      /* TAC */
-static int hf_xnap_ranac = -1;                    /* RANAC */
 static int hf_xnap_NeighbourInformation_NR_item = -1;  /* NeighbourInformation_NR_Item */
 static int hf_xnap_nr_PCI = -1;                   /* NRPCI */
 static int hf_xnap_nr_cgi = -1;                   /* NR_CGI */
@@ -631,7 +663,7 @@ static int hf_xnap_e_utra = -1;                   /* E_UTRA_Cell_Identity */
 static int hf_xnap_nr_01 = -1;                    /* NRPCI */
 static int hf_xnap_e_utra_01 = -1;                /* E_UTRAPCI */
 static int hf_xnap_NG_RAN_Cell_Identity_ListinRANPagingArea_item = -1;  /* NG_RAN_Cell_Identity */
-static int hf_xnap_nr_CI = -1;                    /* NR_Cell_Identity */
+static int hf_xnap_nr_CI_01 = -1;                 /* NR_Cell_Identity */
 static int hf_xnap_NRFrequencyBand_List_item = -1;  /* NRFrequencyBandItem */
 static int hf_xnap_nr_frequency_band = -1;        /* NRFrequencyBand */
 static int hf_xnap_supported_SUL_Band_List = -1;  /* SupportedSULBandList */
@@ -701,6 +733,7 @@ static int hf_xnap_qoSFlowsMappedtoDRB_SetupResponse_SNterminated = -1;  /* QoSF
 static int hf_xnap_QoSFlowsMappedtoDRB_SetupResponse_SNterminated_item = -1;  /* QoSFlowsMappedtoDRB_SetupResponse_SNterminated_Item */
 static int hf_xnap_qoSFlowIdentifier = -1;        /* QoSFlowIdentifier */
 static int hf_xnap_mCGRequestedGBRQoSFlowInfo = -1;  /* GBRQoSFlowInfo */
+static int hf_xnap_qosFlowMappingIndication = -1;  /* QoSFlowMappingIndication */
 static int hf_xnap_dRBsToBeSetup_01 = -1;         /* DRBsToBeSetupList_Setup_MNterminated */
 static int hf_xnap_DRBsToBeSetupList_Setup_MNterminated_item = -1;  /* DRBsToBeSetupList_Setup_MNterminated_Item */
 static int hf_xnap_mN_UL_PDCP_UP_TNLInfo = -1;    /* UPTransportParameters */
@@ -782,7 +815,6 @@ static int hf_xnap_QoSFlows_List_item = -1;       /* QoSFlow_Item */
 static int hf_xnap_QoSFlows_List_withCause_item = -1;  /* QoSFlowwithCause_Item */
 static int hf_xnap_QoSFlowsAdmitted_List_item = -1;  /* QoSFlowsAdmitted_Item */
 static int hf_xnap_QoSFlowsToBeSetup_List_item = -1;  /* QoSFlowsToBeSetup_Item */
-static int hf_xnap_dlDataForwarding = -1;         /* DLForwarding */
 static int hf_xnap_e_RAB_ID = -1;                 /* E_RAB_ID */
 static int hf_xnap_QoSFlowsUsageReportList_item = -1;  /* QoSFlowsUsageReport_Item */
 static int hf_xnap_rATType_01 = -1;               /* T_rATType_01 */
@@ -818,7 +850,7 @@ static int hf_xnap_maximumIPdatarate = -1;        /* MaximumIPdatarate */
 static int hf_xnap_integrityProtectionResult = -1;  /* T_integrityProtectionResult */
 static int hf_xnap_confidentialityProtectionResult = -1;  /* T_confidentialityProtectionResult */
 static int hf_xnap_e_utra_pci = -1;               /* E_UTRAPCI */
-static int hf_xnap_broadcastPLMNs = -1;           /* SEQUENCE_SIZE_1_maxnoofBPLMNs_OF_ServedCellInformation_E_UTRA_perBPLMN */
+static int hf_xnap_broadcastPLMNs_02 = -1;        /* SEQUENCE_SIZE_1_maxnoofBPLMNs_OF_ServedCellInformation_E_UTRA_perBPLMN */
 static int hf_xnap_broadcastPLMNs_item = -1;      /* ServedCellInformation_E_UTRA_perBPLMN */
 static int hf_xnap_e_utra_mode_info = -1;         /* ServedCellInformation_E_UTRA_ModeInfo */
 static int hf_xnap_numberofAntennaPorts = -1;     /* NumberOfAntennaPorts_E_UTRA */
@@ -882,7 +914,7 @@ static int hf_xnap_sulTransmissionBandwidth = -1;  /* NRTransmissionBandwidth */
 static int hf_xnap_SupportedSULBandList_item = -1;  /* SupportedSULBandItem */
 static int hf_xnap_sulBandItem = -1;              /* SUL_FrequencyBand */
 static int hf_xnap_TAISupport_List_item = -1;     /* TAISupport_Item */
-static int hf_xnap_broadcastPLMNs_01 = -1;        /* SEQUENCE_SIZE_1_maxnoofsupportedPLMNs_OF_BroadcastPLMNinTAISupport_Item */
+static int hf_xnap_broadcastPLMNs_03 = -1;        /* SEQUENCE_SIZE_1_maxnoofsupportedPLMNs_OF_BroadcastPLMNinTAISupport_Item */
 static int hf_xnap_broadcastPLMNs_item_01 = -1;   /* BroadcastPLMNinTAISupport_Item */
 static int hf_xnap_nr_02 = -1;                    /* NR_CGI */
 static int hf_xnap_e_utra_02 = -1;                /* E_UTRA_CGI */
@@ -918,6 +950,8 @@ static int hf_xnap_mobilityRestrictionList = -1;  /* MobilityRestrictionList */
 static int hf_xnap_indexToRatFrequencySelectionPriority = -1;  /* RFSP_Index */
 static int hf_xnap_UEHistoryInformation_item = -1;  /* LastVisitedCell_Item */
 static int hf_xnap_indexLength10 = -1;            /* BIT_STRING_SIZE_10 */
+static int hf_xnap_uERadioCapabilityForPagingOfNR = -1;  /* UERadioCapabilityForPagingOfNR */
+static int hf_xnap_uERadioCapabilityForPagingOfEUTRA = -1;  /* UERadioCapabilityForPagingOfEUTRA */
 static int hf_xnap_nr_EncyptionAlgorithms = -1;   /* T_nr_EncyptionAlgorithms */
 static int hf_xnap_nr_IntegrityProtectionAlgorithms = -1;  /* T_nr_IntegrityProtectionAlgorithms */
 static int hf_xnap_e_utra_EncyptionAlgorithms = -1;  /* T_e_utra_EncyptionAlgorithms */
@@ -983,8 +1017,7 @@ static int hf_xnap_sn_terminated_06 = -1;         /* PDUSessionResourceModConfir
 static int hf_xnap_mn_terminated_06 = -1;         /* PDUSessionResourceModConfirmInfo_MNterminated */
 static int hf_xnap_sn_terminated_07 = -1;         /* PDUSession_List_withDataForwardingFromTarget */
 static int hf_xnap_mn_terminated_07 = -1;         /* PDUSession_List */
-static int hf_xnap_pduSessionsToBeReleasedList_SNterminated = -1;  /* PDUSession_List_withDataForwardingFromTarget */
-static int hf_xnap_pduSessionsToBeReleasedList_SNterminated_01 = -1;  /* PDUSession_List_withDataForwardingRequest */
+static int hf_xnap_pduSessionsToBeReleasedList_SNterminated = -1;  /* PDUSession_List_withDataForwardingRequest */
 static int hf_xnap_pduSessionsReleasedList_SNterminated = -1;  /* PDUSession_List_withDataForwardingFromTarget */
 static int hf_xnap_BearersSubjectToCounterCheck_List_item = -1;  /* BearersSubjectToCounterCheck_Item */
 static int hf_xnap_ul_count = -1;                 /* INTEGER_0_4294967295 */
@@ -1070,6 +1103,8 @@ static gint ett_xnap_LastVisitedEUTRANCellInformation = -1;
 static gint ett_xnap_LastVisitedNGRANCellInformation = -1;
 static gint ett_xnap_LastVisitedUTRANCellInformation = -1;
 static gint ett_xnap_LastVisitedGERANCellInformation = -1;
+static gint ett_xnap_UERadioCapabilityForPagingOfNR = -1;
+static gint ett_xnap_UERadioCapabilityForPagingOfEUTRA = -1;
 
 /*--- Included file: packet-xnap-ett.c ---*/
 #line 1 "./asn1/xnap/packet-xnap-ett.c"
@@ -1083,13 +1118,18 @@ static gint ett_xnap_PrivateIE_Field = -1;
 static gint ett_xnap_Additional_UL_NG_U_TNLatUPF_Item = -1;
 static gint ett_xnap_Additional_UL_NG_U_TNLatUPF_List = -1;
 static gint ett_xnap_AllocationandRetentionPriority = -1;
-static gint ett_xnap_AMF_Set_Information = -1;
-static gint ett_xnap_GlobalAMF_Set_Information = -1;
+static gint ett_xnap_AMF_Region_Information = -1;
+static gint ett_xnap_GlobalAMF_Region_Information = -1;
 static gint ett_xnap_AreaOfInterestInformation = -1;
 static gint ett_xnap_AreaOfInterest_Item = -1;
 static gint ett_xnap_AS_SecurityInformation = -1;
 static gint ett_xnap_AssistanceDataForRANPaging = -1;
+static gint ett_xnap_BPLMN_ID_Info_EUTRA = -1;
+static gint ett_xnap_BPLMN_ID_Info_EUTRA_Item = -1;
+static gint ett_xnap_BPLMN_ID_Info_NR = -1;
+static gint ett_xnap_BPLMN_ID_Info_NR_Item = -1;
 static gint ett_xnap_BroadcastPLMNs = -1;
+static gint ett_xnap_BroadcastEUTRAPLMNs = -1;
 static gint ett_xnap_BroadcastPLMNinTAISupport_Item = -1;
 static gint ett_xnap_Cause = -1;
 static gint ett_xnap_CellAssistanceInfo_NR = -1;
@@ -1167,6 +1207,7 @@ static gint ett_xnap_MR_DC_ResourceCoordinationInfo = -1;
 static gint ett_xnap_NG_RAN_Node_ResourceCoordinationInfo = -1;
 static gint ett_xnap_E_UTRA_ResourceCoordinationInfo = -1;
 static gint ett_xnap_NR_ResourceCoordinationInfo = -1;
+static gint ett_xnap_NE_DC_TDM_Pattern = -1;
 static gint ett_xnap_NeighbourInformation_E_UTRA = -1;
 static gint ett_xnap_NeighbourInformation_E_UTRA_Item = -1;
 static gint ett_xnap_NeighbourInformation_NR = -1;
@@ -1354,6 +1395,7 @@ static gint ett_xnap_UEContextIDforRRCReestablishment = -1;
 static gint ett_xnap_UEContextInfoRetrUECtxtResp = -1;
 static gint ett_xnap_UEHistoryInformation = -1;
 static gint ett_xnap_UEIdentityIndexValue = -1;
+static gint ett_xnap_UERadioCapabilityForPaging = -1;
 static gint ett_xnap_UERANPagingIdentity = -1;
 static gint ett_xnap_UESecurityCapabilities = -1;
 static gint ett_xnap_T_nr_EncyptionAlgorithms = -1;
@@ -1407,6 +1449,7 @@ static gint ett_xnap_PDUSessionAdmittedToBeModifiedSNModResponse = -1;
 static gint ett_xnap_PDUSessionAdmittedToBeModifiedSNModResponse_Item = -1;
 static gint ett_xnap_PDUSessionAdmittedToBeReleasedSNModResponse = -1;
 static gint ett_xnap_PDUSessionNotAdmitted_SNModResponse = -1;
+static gint ett_xnap_PDUSessionDataForwarding_SNModResponse = -1;
 static gint ett_xnap_SNodeModificationRequestReject = -1;
 static gint ett_xnap_SNodeModificationRequired = -1;
 static gint ett_xnap_PDUSessionToBeModifiedSNModRequired = -1;
@@ -1483,7 +1526,7 @@ static gint ett_xnap_SuccessfulOutcome = -1;
 static gint ett_xnap_UnsuccessfulOutcome = -1;
 
 /*--- End of included file: packet-xnap-ett.c ---*/
-#line 69 "./asn1/xnap/packet-xnap-template.c"
+#line 71 "./asn1/xnap/packet-xnap-template.c"
 
 enum {
   XNAP_NG_RAN_CONTAINER_AUTOMATIC,
@@ -1696,7 +1739,7 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
   { id_ActivationIDforCellActivation, "id-ActivationIDforCellActivation" },
   { id_admittedSplitSRB, "id-admittedSplitSRB" },
   { id_admittedSplitSRBrelease, "id-admittedSplitSRBrelease" },
-  { id_AMF_Set_Information, "id-AMF-Set-Information" },
+  { id_AMF_Region_Information, "id-AMF-Region-Information" },
   { id_AssistanceDataForRANPaging, "id-AssistanceDataForRANPaging" },
   { id_BearersSubjectToCounterCheck, "id-BearersSubjectToCounterCheck" },
   { id_Cause, "id-Cause" },
@@ -1798,7 +1841,7 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
   { id_TNLA_Failed_To_Setup_List, "id-TNLA-Failed-To-Setup-List" },
   { id_PDUSessionToBeReleased_RelReqAck, "id-PDUSessionToBeReleased-RelReqAck" },
   { id_S_NG_RANnodeMaxIPDataRate_UL, "id-S-NG-RANnodeMaxIPDataRate-UL" },
-  { id_PDUSession_List_withDataForwardingRequest, "id-PDUSession-List-withDataForwardingRequest" },
+  { id_Unknown_106, "id-Unknown-106" },
   { id_PDUSessionResourceSecondaryRATUsageList, "id-PDUSessionResourceSecondaryRATUsageList" },
   { id_Additional_UL_NG_U_TNLatUPF_List, "id-Additional-UL-NG-U-TNLatUPF-List" },
   { id_SecondarydataForwardingInfoFromTarget_List, "id-SecondarydataForwardingInfoFromTarget-List" },
@@ -1810,6 +1853,19 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
   { id_SecurityResult, "id-SecurityResult" },
   { id_S_NSSAI, "id-S-NSSAI" },
   { id_MR_DC_ResourceCoordinationInfo, "id-MR-DC-ResourceCoordinationInfo" },
+  { id_AMF_Region_Information_To_Add, "id-AMF-Region-Information-To-Add" },
+  { id_AMF_Region_Information_To_Delete, "id-AMF-Region-Information-To-Delete" },
+  { id_OldQoSFlowMap_ULendmarkerexpected, "id-OldQoSFlowMap-ULendmarkerexpected" },
+  { id_RANPagingFailure, "id-RANPagingFailure" },
+  { id_UERadioCapabilityForPaging, "id-UERadioCapabilityForPaging" },
+  { id_PDUSessionDataForwarding_SNModResponse, "id-PDUSessionDataForwarding-SNModResponse" },
+  { id_DRBsNotAdmittedSetupModifyList, "id-DRBsNotAdmittedSetupModifyList" },
+  { id_Secondary_MN_Xn_U_TNLInfoatM, "id-Secondary-MN-Xn-U-TNLInfoatM" },
+  { id_NE_DC_TDM_Pattern, "id-NE-DC-TDM-Pattern" },
+  { id_PDUSessionCommonNetworkInstance, "id-PDUSessionCommonNetworkInstance" },
+  { id_BPLMN_ID_Info_EUTRA, "id-BPLMN-ID-Info-EUTRA" },
+  { id_BPLMN_ID_Info_NR, "id-BPLMN-ID-Info-NR" },
+  { id_InterfaceInstanceIndication, "id-InterfaceInstanceIndication" },
   { 0, NULL }
 };
 
@@ -2198,42 +2254,31 @@ dissect_xnap_BIT_STRING_SIZE_8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 }
 
 
-
-static int
-dissect_xnap_BIT_STRING_SIZE_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
-                                     10, 10, FALSE, NULL, 0, NULL, NULL);
-
-  return offset;
-}
-
-
-static const per_sequence_t GlobalAMF_Set_Information_sequence[] = {
+static const per_sequence_t GlobalAMF_Region_Information_sequence[] = {
   { &hf_xnap_plmn_ID        , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_PLMN_Identity },
   { &hf_xnap_amf_region_id  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_BIT_STRING_SIZE_8 },
-  { &hf_xnap_amf_set_id     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_BIT_STRING_SIZE_10 },
   { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
 
 static int
-dissect_xnap_GlobalAMF_Set_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_xnap_GlobalAMF_Region_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_xnap_GlobalAMF_Set_Information, GlobalAMF_Set_Information_sequence);
+                                   ett_xnap_GlobalAMF_Region_Information, GlobalAMF_Region_Information_sequence);
 
   return offset;
 }
 
 
-static const per_sequence_t AMF_Set_Information_sequence_of[1] = {
-  { &hf_xnap_AMF_Set_Information_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_xnap_GlobalAMF_Set_Information },
+static const per_sequence_t AMF_Region_Information_sequence_of[1] = {
+  { &hf_xnap_AMF_Region_Information_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_xnap_GlobalAMF_Region_Information },
 };
 
 static int
-dissect_xnap_AMF_Set_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_xnap_AMF_Region_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
-                                                  ett_xnap_AMF_Set_Information, AMF_Set_Information_sequence_of,
-                                                  1, maxnoofAMFSets, FALSE);
+                                                  ett_xnap_AMF_Region_Information, AMF_Region_Information_sequence_of,
+                                                  1, maxnoofAMFRegions, FALSE);
 
   return offset;
 }
@@ -2724,11 +2769,57 @@ dissect_xnap_AveragingWindow(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
+static const per_sequence_t BroadcastEUTRAPLMNs_sequence_of[1] = {
+  { &hf_xnap_BroadcastEUTRAPLMNs_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_xnap_PLMN_Identity },
+};
 
 static int
-dissect_xnap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
-                                                            0U, G_GUINT64_CONSTANT(4000000000000), NULL, TRUE);
+dissect_xnap_BroadcastEUTRAPLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+                                                  ett_xnap_BroadcastEUTRAPLMNs, BroadcastEUTRAPLMNs_sequence_of,
+                                                  1, maxnoofEUTRABPLMNs, FALSE);
+
+  return offset;
+}
+
+
+
+static int
+dissect_xnap_RANAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+                                                            0U, 255U, NULL, FALSE);
+
+  return offset;
+}
+
+
+static const per_sequence_t BPLMN_ID_Info_EUTRA_Item_sequence[] = {
+  { &hf_xnap_broadcastPLMNs , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_BroadcastEUTRAPLMNs },
+  { &hf_xnap_tac            , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_TAC },
+  { &hf_xnap_e_utraCI       , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_E_UTRA_Cell_Identity },
+  { &hf_xnap_ranac          , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_RANAC },
+  { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_xnap_BPLMN_ID_Info_EUTRA_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_xnap_BPLMN_ID_Info_EUTRA_Item, BPLMN_ID_Info_EUTRA_Item_sequence);
+
+  return offset;
+}
+
+
+static const per_sequence_t BPLMN_ID_Info_EUTRA_sequence_of[1] = {
+  { &hf_xnap_BPLMN_ID_Info_EUTRA_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_xnap_BPLMN_ID_Info_EUTRA_Item },
+};
+
+static int
+dissect_xnap_BPLMN_ID_Info_EUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+                                                  ett_xnap_BPLMN_ID_Info_EUTRA, BPLMN_ID_Info_EUTRA_sequence_of,
+                                                  1, maxnoofEUTRABPLMNs, FALSE);
 
   return offset;
 }
@@ -2748,6 +2839,48 @@ dissect_xnap_BroadcastPLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
+static const per_sequence_t BPLMN_ID_Info_NR_Item_sequence[] = {
+  { &hf_xnap_broadcastPLMNs_01, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_BroadcastPLMNs },
+  { &hf_xnap_tac            , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_TAC },
+  { &hf_xnap_nr_CI          , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_NR_Cell_Identity },
+  { &hf_xnap_ranac          , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_RANAC },
+  { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_xnap_BPLMN_ID_Info_NR_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_xnap_BPLMN_ID_Info_NR_Item, BPLMN_ID_Info_NR_Item_sequence);
+
+  return offset;
+}
+
+
+static const per_sequence_t BPLMN_ID_Info_NR_sequence_of[1] = {
+  { &hf_xnap_BPLMN_ID_Info_NR_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_xnap_BPLMN_ID_Info_NR_Item },
+};
+
+static int
+dissect_xnap_BPLMN_ID_Info_NR(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
+                                                  ett_xnap_BPLMN_ID_Info_NR, BPLMN_ID_Info_NR_sequence_of,
+                                                  1, maxnoofBPLMNs, FALSE);
+
+  return offset;
+}
+
+
+
+static int
+dissect_xnap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
+                                                            0U, G_GUINT64_CONSTANT(4000000000000), NULL, TRUE);
+
+  return offset;
+}
+
+
 
 static int
 dissect_xnap_OCTET_STRING_SIZE_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -2971,7 +3104,7 @@ dissect_xnap_Cause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
 
 static const per_sequence_t NR_CGI_sequence[] = {
   { &hf_xnap_plmn_id        , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_PLMN_Identity },
-  { &hf_xnap_nr_CI          , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_NR_Cell_Identity },
+  { &hf_xnap_nr_CI_01       , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_NR_Cell_Identity },
   { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -3525,8 +3658,25 @@ dissect_xnap_QoSFLowsToBeForwarded_List(tvbuff_t *tvb _U_, int offset _U_, asn1_
 }
 
 
+static const value_string xnap_QoSFlowMappingIndication_vals[] = {
+  {   0, "ul" },
+  {   1, "dl" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_xnap_QoSFlowMappingIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     2, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 static const per_sequence_t QoSFlow_Item_sequence[] = {
   { &hf_xnap_qfi            , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_QoSFlowIdentifier },
+  { &hf_xnap_qosFlowMappingIndication, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_QoSFlowMappingIndication },
   { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -3554,22 +3704,6 @@ dissect_xnap_QoSFlows_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 }
 
 
-static const value_string xnap_QoSFlowMappingIndication_vals[] = {
-  {   0, "ul" },
-  {   1, "dl" },
-  { 0, NULL }
-};
-
-
-static int
-dissect_xnap_QoSFlowMappingIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
-                                     2, NULL, TRUE, 0, NULL);
-
-  return offset;
-}
-
-
 static const value_string xnap_RLCMode_vals[] = {
   {   0, "rlc-am" },
   {   1, "rlc-um-bidirectional" },
@@ -3591,7 +3725,6 @@ dissect_xnap_RLCMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
 static const per_sequence_t DRBToQoSFlowMapping_Item_sequence[] = {
   { &hf_xnap_drb_ID         , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_DRB_ID },
   { &hf_xnap_qosFlows_List  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_QoSFlows_List },
-  { &hf_xnap_qosFlowMappingIndication, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_QoSFlowMappingIndication },
   { &hf_xnap_rLC_Mode       , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_RLCMode },
   { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
@@ -4569,6 +4702,16 @@ dissect_xnap_GBRQoSFlowInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 
 static int
+dissect_xnap_BIT_STRING_SIZE_10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
+                                     10, 10, FALSE, NULL, 0, NULL, NULL);
+
+  return offset;
+}
+
+
+
+static int
 dissect_xnap_BIT_STRING_SIZE_6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      6, 6, FALSE, NULL, 0, NULL, NULL);
@@ -4597,6 +4740,16 @@ dissect_xnap_GUAMI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
 
 
 static int
+dissect_xnap_InterfaceInstanceIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+                                                            0U, 255U, NULL, TRUE);
+
+  return offset;
+}
+
+
+
+static int
 dissect_xnap_BIT_STRING_SIZE_40(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      40, 40, FALSE, NULL, 0, NULL, NULL);
@@ -5238,11 +5391,48 @@ dissect_xnap_MR_DC_ResourceCoordinationInfo(tvbuff_t *tvb _U_, int offset _U_, a
 }
 
 
+static const value_string xnap_T_subframeAssignment_vals[] = {
+  {   0, "sa0" },
+  {   1, "sa1" },
+  {   2, "sa2" },
+  {   3, "sa3" },
+  {   4, "sa4" },
+  {   5, "sa5" },
+  {   6, "sa6" },
+  { 0, NULL }
+};
+
 
 static int
-dissect_xnap_RANAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_xnap_T_subframeAssignment(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     7, NULL, FALSE, 0, NULL);
+
+  return offset;
+}
+
+
+
+static int
+dissect_xnap_INTEGER_0_9(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                                            0U, 255U, NULL, FALSE);
+                                                            0U, 9U, NULL, FALSE);
+
+  return offset;
+}
+
+
+static const per_sequence_t NE_DC_TDM_Pattern_sequence[] = {
+  { &hf_xnap_subframeAssignment, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_T_subframeAssignment },
+  { &hf_xnap_harqOffset     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_INTEGER_0_9 },
+  { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_xnap_NE_DC_TDM_Pattern(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_xnap_NE_DC_TDM_Pattern, NE_DC_TDM_Pattern_sequence);
 
   return offset;
 }
@@ -5993,7 +6183,7 @@ dissect_xnap_PDUSession_List_withDataForwardingFromTarget(tvbuff_t *tvb _U_, int
 
 static const per_sequence_t PDUSession_List_withDataForwardingRequest_Item_sequence[] = {
   { &hf_xnap_pduSessionId   , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_PDUSession_ID },
-  { &hf_xnap_dataforwardingInfofromSource, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_DataforwardingandOffloadingInfofromSource },
+  { &hf_xnap_dataforwardingInfofromSource, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DataforwardingandOffloadingInfofromSource },
   { &hf_xnap_dRBtoBeReleasedList, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DRBToQoSFlowMapping_List },
   { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
@@ -6329,7 +6519,6 @@ dissect_xnap_QoSFlowLevelQoSParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 
 static const per_sequence_t QoSFlowsToBeSetup_Item_sequence[] = {
   { &hf_xnap_qfi            , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_QoSFlowIdentifier },
-  { &hf_xnap_dlDataForwarding, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DLForwarding },
   { &hf_xnap_qosFlowLevelQoSParameters, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_QoSFlowLevelQoSParameters },
   { &hf_xnap_e_RAB_ID       , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_E_RAB_ID },
   { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
@@ -6628,7 +6817,7 @@ dissect_xnap_SecurityResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 static const per_sequence_t PDUSessionResourceSetupResponseInfo_SNterminated_sequence[] = {
   { &hf_xnap_dL_NG_U_TNLatNG_RAN, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_UPTransportLayerInformation },
-  { &hf_xnap_dRBsToBeSetup  , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_DRBsToBeSetupList_SetupResponse_SNterminated },
+  { &hf_xnap_dRBsToBeSetup  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DRBsToBeSetupList_SetupResponse_SNterminated },
   { &hf_xnap_dataforwardinginfoTarget, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DataForwardingInfoFromTargetNGRANnode },
   { &hf_xnap_qosFlowsNotAdmittedList, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_QoSFlows_List_withCause },
   { &hf_xnap_securityResult , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_SecurityResult },
@@ -6897,7 +7086,6 @@ static const per_sequence_t DRBsToBeModifiedList_ModificationResponse_SNterminat
   { &hf_xnap_drb_ID         , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_DRB_ID },
   { &hf_xnap_sN_UL_PDCP_UP_TNLInfo, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportParameters },
   { &hf_xnap_dRB_QoS        , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_QoSFlowLevelQoSParameters },
-  { &hf_xnap_pDCP_SNLength  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_PDCPSNLength },
   { &hf_xnap_qoSFlowsMappedtoDRB_SetupResponse_SNterminated, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_QoSFlowsMappedtoDRB_SetupResponse_SNterminated },
   { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
@@ -6927,7 +7115,7 @@ dissect_xnap_DRBsToBeModifiedList_ModificationResponse_SNterminated(tvbuff_t *tv
 
 
 static const per_sequence_t PDUSessionResourceModificationResponseInfo_SNterminated_sequence[] = {
-  { &hf_xnap_dL_NG_U_TNLatNG_RAN, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_UPTransportLayerInformation },
+  { &hf_xnap_dL_NG_U_TNLatNG_RAN, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportLayerInformation },
   { &hf_xnap_dRBsToBeSetup  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DRBsToBeSetupList_SetupResponse_SNterminated },
   { &hf_xnap_dataforwardinginfoTarget, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DataForwardingInfoFromTargetNGRANnode },
   { &hf_xnap_dRBsToBeModified, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_DRBsToBeModifiedList_ModificationResponse_SNterminated },
@@ -6952,7 +7140,6 @@ static const per_sequence_t DRBsToBeModifiedList_Modification_MNterminated_Item_
   { &hf_xnap_drb_ID         , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_DRB_ID },
   { &hf_xnap_mN_UL_PDCP_UP_TNLInfo, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportParameters },
   { &hf_xnap_dRB_QoS        , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_QoSFlowLevelQoSParameters },
-  { &hf_xnap_pDCP_SNLength  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_PDCPSNLength },
   { &hf_xnap_secondary_MN_UL_PDCP_UP_TNLInfo, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UPTransportParameters },
   { &hf_xnap_uL_Configuration, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ULConfiguration },
   { &hf_xnap_pdcpDuplicationConfiguration, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_PDCPDuplicationConfiguration },
@@ -7585,6 +7772,16 @@ dissect_xnap_PDUSessionResourceSecondaryRATUsageList(tvbuff_t *tvb _U_, int offs
 }
 
 
+
+static int
+dissect_xnap_PDUSessionCommonNetworkInstance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, NULL);
+
+  return offset;
+}
+
+
 static const value_string xnap_T_resourceType_vals[] = {
   {   0, "downlinknonCRS" },
   {   1, "cRS" },
@@ -7834,6 +8031,21 @@ dissect_xnap_RANPagingArea(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 }
 
 
+static const value_string xnap_RANPagingFailure_vals[] = {
+  {   0, "true" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_xnap_RANPagingFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     1, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 static const per_sequence_t ResetRequestTypeInfo_Full_sequence[] = {
   { &hf_xnap_iE_Extension   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
@@ -8273,7 +8485,7 @@ static const per_sequence_t ServedCellInformation_E_UTRA_sequence[] = {
   { &hf_xnap_e_utra_cgi     , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_E_UTRA_CGI },
   { &hf_xnap_tac            , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_TAC },
   { &hf_xnap_ranac          , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_RANAC },
-  { &hf_xnap_broadcastPLMNs , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_SEQUENCE_SIZE_1_maxnoofBPLMNs_OF_ServedCellInformation_E_UTRA_perBPLMN },
+  { &hf_xnap_broadcastPLMNs_02, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_SEQUENCE_SIZE_1_maxnoofBPLMNs_OF_ServedCellInformation_E_UTRA_perBPLMN },
   { &hf_xnap_e_utra_mode_info, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_ServedCellInformation_E_UTRA_ModeInfo },
   { &hf_xnap_numberofAntennaPorts, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_NumberOfAntennaPorts_E_UTRA },
   { &hf_xnap_prach_configuration, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_E_UTRAPRACHConfiguration },
@@ -8595,7 +8807,7 @@ dissect_xnap_SEQUENCE_SIZE_1_maxnoofsupportedPLMNs_OF_BroadcastPLMNinTAISupport_
 
 static const per_sequence_t TAISupport_Item_sequence[] = {
   { &hf_xnap_tac            , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_TAC },
-  { &hf_xnap_broadcastPLMNs_01, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_SEQUENCE_SIZE_1_maxnoofsupportedPLMNs_OF_BroadcastPLMNinTAISupport_Item },
+  { &hf_xnap_broadcastPLMNs_03, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_SEQUENCE_SIZE_1_maxnoofsupportedPLMNs_OF_BroadcastPLMNinTAISupport_Item },
   { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -9174,6 +9386,62 @@ dissect_xnap_UEIdentityIndexValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
+
+static int
+dissect_xnap_UERadioCapabilityForPagingOfNR(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 425 "./asn1/xnap/xnap.cnf"
+  tvbuff_t *parameter_tvb = NULL;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
+
+  if (parameter_tvb) {
+    proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_UERadioCapabilityForPagingOfNR);
+    dissect_nr_rrc_UERadioPagingInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
+
+  return offset;
+}
+
+
+
+static int
+dissect_xnap_UERadioCapabilityForPagingOfEUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 434 "./asn1/xnap/xnap.cnf"
+  tvbuff_t *parameter_tvb = NULL;
+
+  offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
+                                       NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
+
+  if (parameter_tvb) {
+    proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_xnap_UERadioCapabilityForPagingOfEUTRA);
+    dissect_lte_rrc_UERadioPagingInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+
+
+  return offset;
+}
+
+
+static const per_sequence_t UERadioCapabilityForPaging_sequence[] = {
+  { &hf_xnap_uERadioCapabilityForPagingOfNR, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UERadioCapabilityForPagingOfNR },
+  { &hf_xnap_uERadioCapabilityForPagingOfEUTRA, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_UERadioCapabilityForPagingOfEUTRA },
+  { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_xnap_UERadioCapabilityForPaging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_xnap_UERadioCapabilityForPaging, UERadioCapabilityForPaging_sequence);
+
+  return offset;
+}
+
+
 static const value_string xnap_UERANPagingIdentity_vals[] = {
   {   0, "i-RNTI-full" },
   {   1, "choice-extension" },
@@ -9229,7 +9497,7 @@ static const per_sequence_t HandoverRequest_sequence[] = {
 
 static int
 dissect_xnap_HandoverRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 427 "./asn1/xnap/xnap.cnf"
+#line 445 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9317,7 +9585,7 @@ static const per_sequence_t HandoverRequestAcknowledge_sequence[] = {
 
 static int
 dissect_xnap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 429 "./asn1/xnap/xnap.cnf"
+#line 447 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequestAcknowledge");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9365,7 +9633,7 @@ static const per_sequence_t HandoverPreparationFailure_sequence[] = {
 
 static int
 dissect_xnap_HandoverPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 431 "./asn1/xnap/xnap.cnf"
+#line 449 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverPreparationFailure");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9382,7 +9650,7 @@ static const per_sequence_t SNStatusTransfer_sequence[] = {
 
 static int
 dissect_xnap_SNStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 433 "./asn1/xnap/xnap.cnf"
+#line 451 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNStatusTransfer");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9399,7 +9667,7 @@ static const per_sequence_t UEContextRelease_sequence[] = {
 
 static int
 dissect_xnap_UEContextRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 447 "./asn1/xnap/xnap.cnf"
+#line 465 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextRelease");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9416,7 +9684,7 @@ static const per_sequence_t HandoverCancel_sequence[] = {
 
 static int
 dissect_xnap_HandoverCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 435 "./asn1/xnap/xnap.cnf"
+#line 453 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancel");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9433,7 +9701,7 @@ static const per_sequence_t RANPaging_sequence[] = {
 
 static int
 dissect_xnap_RANPaging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 443 "./asn1/xnap/xnap.cnf"
+#line 461 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANPaging");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9450,7 +9718,7 @@ static const per_sequence_t RetrieveUEContextRequest_sequence[] = {
 
 static int
 dissect_xnap_RetrieveUEContextRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 437 "./asn1/xnap/xnap.cnf"
+#line 455 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9467,7 +9735,7 @@ static const per_sequence_t RetrieveUEContextResponse_sequence[] = {
 
 static int
 dissect_xnap_RetrieveUEContextResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 439 "./asn1/xnap/xnap.cnf"
+#line 457 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextResponse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9484,7 +9752,7 @@ static const per_sequence_t RetrieveUEContextFailure_sequence[] = {
 
 static int
 dissect_xnap_RetrieveUEContextFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 441 "./asn1/xnap/xnap.cnf"
+#line 459 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RetrieveUEContextFailure");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9511,7 +9779,7 @@ static const per_sequence_t XnUAddressIndication_sequence[] = {
 
 static int
 dissect_xnap_XnUAddressIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 445 "./asn1/xnap/xnap.cnf"
+#line 463 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnUAddressIndication");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9528,7 +9796,7 @@ static const per_sequence_t SNodeAdditionRequest_sequence[] = {
 
 static int
 dissect_xnap_SNodeAdditionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 449 "./asn1/xnap/xnap.cnf"
+#line 467 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeAdditionRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9609,7 +9877,7 @@ static const per_sequence_t SNodeAdditionRequestAcknowledge_sequence[] = {
 
 static int
 dissect_xnap_SNodeAdditionRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 451 "./asn1/xnap/xnap.cnf"
+#line 469 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeAdditionRequestAcknowledge");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9704,7 +9972,7 @@ static const per_sequence_t SNodeAdditionRequestReject_sequence[] = {
 
 static int
 dissect_xnap_SNodeAdditionRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 453 "./asn1/xnap/xnap.cnf"
+#line 471 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeAdditionRequestReject");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9721,7 +9989,7 @@ static const per_sequence_t SNodeReconfigurationComplete_sequence[] = {
 
 static int
 dissect_xnap_SNodeReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 455 "./asn1/xnap/xnap.cnf"
+#line 473 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeReconfigurationComplete");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9870,7 +10138,7 @@ static const per_sequence_t SNodeModificationRequest_sequence[] = {
 
 static int
 dissect_xnap_SNodeModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 457 "./asn1/xnap/xnap.cnf"
+#line 475 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeModificationRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -9989,7 +10257,7 @@ static const per_sequence_t SNodeModificationRequestAcknowledge_sequence[] = {
 
 static int
 dissect_xnap_SNodeModificationRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 459 "./asn1/xnap/xnap.cnf"
+#line 477 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeModificationRequestAcknowledge");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10109,6 +10377,21 @@ dissect_xnap_PDUSessionNotAdmitted_SNModResponse(tvbuff_t *tvb _U_, int offset _
 }
 
 
+static const per_sequence_t PDUSessionDataForwarding_SNModResponse_sequence[] = {
+  { &hf_xnap_sn_terminated_04, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_PDUSession_List_withDataForwardingRequest },
+  { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_xnap_PDUSessionDataForwarding_SNModResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_xnap_PDUSessionDataForwarding_SNModResponse, PDUSessionDataForwarding_SNModResponse_sequence);
+
+  return offset;
+}
+
+
 static const per_sequence_t SNodeModificationRequestReject_sequence[] = {
   { &hf_xnap_protocolIEs    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_xnap_ProtocolIE_Container },
   { NULL, 0, 0, NULL }
@@ -10116,7 +10399,7 @@ static const per_sequence_t SNodeModificationRequestReject_sequence[] = {
 
 static int
 dissect_xnap_SNodeModificationRequestReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 461 "./asn1/xnap/xnap.cnf"
+#line 479 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeModificationRequestReject");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10133,7 +10416,7 @@ static const per_sequence_t SNodeModificationRequired_sequence[] = {
 
 static int
 dissect_xnap_SNodeModificationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 463 "./asn1/xnap/xnap.cnf"
+#line 481 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeModificationRequired");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10197,7 +10480,7 @@ static const per_sequence_t SNodeModificationConfirm_sequence[] = {
 
 static int
 dissect_xnap_SNodeModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 465 "./asn1/xnap/xnap.cnf"
+#line 483 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeModificationConfirm");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10261,7 +10544,7 @@ static const per_sequence_t SNodeModificationRefuse_sequence[] = {
 
 static int
 dissect_xnap_SNodeModificationRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 467 "./asn1/xnap/xnap.cnf"
+#line 485 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeModificationRefuse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10278,7 +10561,7 @@ static const per_sequence_t SNodeReleaseRequest_sequence[] = {
 
 static int
 dissect_xnap_SNodeReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 469 "./asn1/xnap/xnap.cnf"
+#line 487 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeReleaseRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10295,7 +10578,7 @@ static const per_sequence_t SNodeReleaseRequestAcknowledge_sequence[] = {
 
 static int
 dissect_xnap_SNodeReleaseRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 471 "./asn1/xnap/xnap.cnf"
+#line 489 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeReleaseRequestAcknowledge");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10306,7 +10589,7 @@ dissect_xnap_SNodeReleaseRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, a
 
 
 static const per_sequence_t PDUSessionToBeReleasedList_RelReqAck_sequence[] = {
-  { &hf_xnap_pduSessionsToBeReleasedList_SNterminated, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_PDUSession_List_withDataForwardingFromTarget },
+  { &hf_xnap_pduSessionsToBeReleasedList_SNterminated, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_PDUSession_List_withDataForwardingRequest },
   { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -10327,7 +10610,7 @@ static const per_sequence_t SNodeReleaseReject_sequence[] = {
 
 static int
 dissect_xnap_SNodeReleaseReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 473 "./asn1/xnap/xnap.cnf"
+#line 491 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeReleaseReject");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10344,7 +10627,7 @@ static const per_sequence_t SNodeReleaseRequired_sequence[] = {
 
 static int
 dissect_xnap_SNodeReleaseRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 475 "./asn1/xnap/xnap.cnf"
+#line 493 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeReleaseRequired");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10355,7 +10638,7 @@ dissect_xnap_SNodeReleaseRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 
 static const per_sequence_t PDUSessionToBeReleasedList_RelRqd_sequence[] = {
-  { &hf_xnap_pduSessionsToBeReleasedList_SNterminated_01, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_PDUSession_List_withDataForwardingRequest },
+  { &hf_xnap_pduSessionsToBeReleasedList_SNterminated, ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_PDUSession_List_withDataForwardingRequest },
   { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -10376,7 +10659,7 @@ static const per_sequence_t SNodeReleaseConfirm_sequence[] = {
 
 static int
 dissect_xnap_SNodeReleaseConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 477 "./asn1/xnap/xnap.cnf"
+#line 495 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeReleaseConfirm");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10408,7 +10691,7 @@ static const per_sequence_t SNodeCounterCheckRequest_sequence[] = {
 
 static int
 dissect_xnap_SNodeCounterCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 479 "./asn1/xnap/xnap.cnf"
+#line 497 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeCounterCheckRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10466,7 +10749,7 @@ static const per_sequence_t SNodeChangeRequired_sequence[] = {
 
 static int
 dissect_xnap_SNodeChangeRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 481 "./asn1/xnap/xnap.cnf"
+#line 499 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeChangeRequired");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10514,7 +10797,7 @@ static const per_sequence_t SNodeChangeConfirm_sequence[] = {
 
 static int
 dissect_xnap_SNodeChangeConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 483 "./asn1/xnap/xnap.cnf"
+#line 501 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeChangeConfirm");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10562,7 +10845,7 @@ static const per_sequence_t SNodeChangeRefuse_sequence[] = {
 
 static int
 dissect_xnap_SNodeChangeRefuse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 485 "./asn1/xnap/xnap.cnf"
+#line 503 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SNodeChangeRefuse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10579,7 +10862,7 @@ static const per_sequence_t RRCTransfer_sequence[] = {
 
 static int
 dissect_xnap_RRCTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 487 "./asn1/xnap/xnap.cnf"
+#line 505 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCTransfer");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10654,7 +10937,7 @@ static const per_sequence_t NotificationControlIndication_sequence[] = {
 
 static int
 dissect_xnap_NotificationControlIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 523 "./asn1/xnap/xnap.cnf"
+#line 541 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NotificationControlIndication");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10701,7 +10984,7 @@ static const per_sequence_t ActivityNotification_sequence[] = {
 
 static int
 dissect_xnap_ActivityNotification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 525 "./asn1/xnap/xnap.cnf"
+#line 543 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ActivityNotification");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10779,7 +11062,7 @@ static const per_sequence_t XnSetupRequest_sequence[] = {
 
 static int
 dissect_xnap_XnSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 495 "./asn1/xnap/xnap.cnf"
+#line 513 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnSetupRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10796,7 +11079,7 @@ static const per_sequence_t XnSetupResponse_sequence[] = {
 
 static int
 dissect_xnap_XnSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 497 "./asn1/xnap/xnap.cnf"
+#line 515 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnSetupResponse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10813,7 +11096,7 @@ static const per_sequence_t XnSetupFailure_sequence[] = {
 
 static int
 dissect_xnap_XnSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 499 "./asn1/xnap/xnap.cnf"
+#line 517 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnSetupFailure");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10830,7 +11113,7 @@ static const per_sequence_t NGRANNodeConfigurationUpdate_sequence[] = {
 
 static int
 dissect_xnap_NGRANNodeConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 501 "./asn1/xnap/xnap.cnf"
+#line 519 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGRANNodeConfigurationUpdate");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10871,7 +11154,7 @@ static const per_sequence_t NGRANNodeConfigurationUpdateAcknowledge_sequence[] =
 
 static int
 dissect_xnap_NGRANNodeConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 503 "./asn1/xnap/xnap.cnf"
+#line 521 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGRANNodeConfigurationUpdateAcknowledge");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10941,7 +11224,7 @@ static const per_sequence_t NGRANNodeConfigurationUpdateFailure_sequence[] = {
 
 static int
 dissect_xnap_NGRANNodeConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 505 "./asn1/xnap/xnap.cnf"
+#line 523 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGRANNodeConfigurationUpdateFailure");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -10958,7 +11241,7 @@ static const per_sequence_t E_UTRA_NR_CellResourceCoordinationRequest_sequence[]
 
 static int
 dissect_xnap_E_UTRA_NR_CellResourceCoordinationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 507 "./asn1/xnap/xnap.cnf"
+#line 525 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "E-UTRA-NR-CellResourceCoordinationRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11034,7 +11317,7 @@ static const per_sequence_t E_UTRA_NR_CellResourceCoordinationResponse_sequence[
 
 static int
 dissect_xnap_E_UTRA_NR_CellResourceCoordinationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 509 "./asn1/xnap/xnap.cnf"
+#line 527 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "E-UTRA-NR-CellResourceCoordinationResponse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11109,7 +11392,7 @@ static const per_sequence_t SecondaryRATDataUsageReport_sequence[] = {
 
 static int
 dissect_xnap_SecondaryRATDataUsageReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 529 "./asn1/xnap/xnap.cnf"
+#line 547 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATDataUsageReport");
 
 
@@ -11127,7 +11410,7 @@ static const per_sequence_t XnRemovalRequest_sequence[] = {
 
 static int
 dissect_xnap_XnRemovalRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 489 "./asn1/xnap/xnap.cnf"
+#line 507 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnRemovalRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11144,7 +11427,7 @@ static const per_sequence_t XnRemovalResponse_sequence[] = {
 
 static int
 dissect_xnap_XnRemovalResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 491 "./asn1/xnap/xnap.cnf"
+#line 509 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnRemovalResponse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11161,7 +11444,7 @@ static const per_sequence_t XnRemovalFailure_sequence[] = {
 
 static int
 dissect_xnap_XnRemovalFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 493 "./asn1/xnap/xnap.cnf"
+#line 511 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "XnRemovalFailure");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11178,7 +11461,7 @@ static const per_sequence_t CellActivationRequest_sequence[] = {
 
 static int
 dissect_xnap_CellActivationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 511 "./asn1/xnap/xnap.cnf"
+#line 529 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11219,7 +11502,7 @@ static const per_sequence_t CellActivationResponse_sequence[] = {
 
 static int
 dissect_xnap_CellActivationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 513 "./asn1/xnap/xnap.cnf"
+#line 531 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationResponse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11260,7 +11543,7 @@ static const per_sequence_t CellActivationFailure_sequence[] = {
 
 static int
 dissect_xnap_CellActivationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 515 "./asn1/xnap/xnap.cnf"
+#line 533 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellActivationFailure");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11277,7 +11560,7 @@ static const per_sequence_t ResetRequest_sequence[] = {
 
 static int
 dissect_xnap_ResetRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 517 "./asn1/xnap/xnap.cnf"
+#line 535 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetRequest");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11294,7 +11577,7 @@ static const per_sequence_t ResetResponse_sequence[] = {
 
 static int
 dissect_xnap_ResetResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 519 "./asn1/xnap/xnap.cnf"
+#line 537 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetResponse");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11311,7 +11594,7 @@ static const per_sequence_t ErrorIndication_sequence[] = {
 
 static int
 dissect_xnap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 521 "./asn1/xnap/xnap.cnf"
+#line 539 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11328,7 +11611,7 @@ static const per_sequence_t PrivateMessage_sequence[] = {
 
 static int
 dissect_xnap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 527 "./asn1/xnap/xnap.cnf"
+#line 545 "./asn1/xnap/xnap.cnf"
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage");
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -11469,11 +11752,11 @@ static int dissect_ActivationIDforCellActivation_PDU(tvbuff_t *tvb _U_, packet_i
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_AMF_Set_Information_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_AMF_Region_Information_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
   asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-  offset = dissect_xnap_AMF_Set_Information(tvb, offset, &asn1_ctx, tree, hf_xnap_AMF_Set_Information_PDU);
+  offset = dissect_xnap_AMF_Region_Information(tvb, offset, &asn1_ctx, tree, hf_xnap_AMF_Region_Information_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -11485,6 +11768,22 @@ static int dissect_AssistanceDataForRANPaging_PDU(tvbuff_t *tvb _U_, packet_info
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_BPLMN_ID_Info_EUTRA_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_BPLMN_ID_Info_EUTRA(tvb, offset, &asn1_ctx, tree, hf_xnap_BPLMN_ID_Info_EUTRA_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+static int dissect_BPLMN_ID_Info_NR_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_BPLMN_ID_Info_NR(tvb, offset, &asn1_ctx, tree, hf_xnap_BPLMN_ID_Info_NR_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_BitRate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11541,6 +11840,14 @@ static int dissect_DRB_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_DRB_List_withCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_DRB_List_withCause(tvb, offset, &asn1_ctx, tree, hf_xnap_DRB_List_withCause_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_DRB_Number_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11589,6 +11896,14 @@ static int dissect_GUAMI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_InterfaceInstanceIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_InterfaceInstanceIndication(tvb, offset, &asn1_ctx, tree, hf_xnap_InterfaceInstanceIndication_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_LocationInformationSNReporting_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11645,6 +11960,14 @@ static int dissect_MR_DC_ResourceCoordinationInfo_PDU(tvbuff_t *tvb _U_, packet_
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_NE_DC_TDM_Pattern_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_NE_DC_TDM_Pattern(tvb, offset, &asn1_ctx, tree, hf_xnap_NE_DC_TDM_Pattern_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_NG_RAN_Cell_Identity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11693,14 +12016,6 @@ static int dissect_PDUSession_List_withCause_PDU(tvbuff_t *tvb _U_, packet_info
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_PDUSession_List_withDataForwardingRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
-  int offset = 0;
-  asn1_ctx_t asn1_ctx;
-  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
-  offset = dissect_xnap_PDUSession_List_withDataForwardingRequest(tvb, offset, &asn1_ctx, tree, hf_xnap_PDUSession_List_withDataForwardingRequest_PDU);
-  offset += 7; offset >>= 3;
-  return offset;
-}
 static int dissect_PDUSessionResourcesAdmitted_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11725,6 +12040,14 @@ static int dissect_PDUSessionResourceSecondaryRATUsageList_PDU(tvbuff_t *tvb _U_
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_PDUSessionCommonNetworkInstance_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_PDUSessionCommonNetworkInstance(tvb, offset, &asn1_ctx, tree, hf_xnap_PDUSessionCommonNetworkInstance_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_PLMN_Identity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11733,6 +12056,14 @@ static int dissect_PLMN_Identity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_QoSFlows_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_QoSFlows_List(tvb, offset, &asn1_ctx, tree, hf_xnap_QoSFlows_List_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_RANPagingArea_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11741,6 +12072,14 @@ static int dissect_RANPagingArea_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_RANPagingFailure_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_RANPagingFailure(tvb, offset, &asn1_ctx, tree, hf_xnap_RANPagingFailure_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_ResetRequestTypeInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11981,6 +12320,14 @@ static int dissect_UEIdentityIndexValue_PDU(tvbuff_t *tvb _U_, packet_info *pinf
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_UERadioCapabilityForPaging_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_UERadioCapabilityForPaging(tvb, offset, &asn1_ctx, tree, hf_xnap_UERadioCapabilityForPaging_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_UERANPagingIdentity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -11997,6 +12344,14 @@ static int dissect_UESecurityCapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pi
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_UPTransportLayerInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_UPTransportLayerInformation(tvb, offset, &asn1_ctx, tree, hf_xnap_UPTransportLayerInformation_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_UserPlaneTrafficActivityReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -12253,6 +12608,14 @@ static int dissect_PDUSessionNotAdmitted_SNModResponse_PDU(tvbuff_t *tvb _U_, pa
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_PDUSessionDataForwarding_SNModResponse_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_xnap_PDUSessionDataForwarding_SNModResponse(tvb, offset, &asn1_ctx, tree, hf_xnap_PDUSessionDataForwarding_SNModResponse_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_SNodeModificationRequestReject_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -12704,7 +13067,7 @@ static int dissect_XnAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-xnap-fn.c ---*/
-#line 167 "./asn1/xnap/packet-xnap-template.c"
+#line 169 "./asn1/xnap/packet-xnap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -12805,14 +13168,22 @@ void proto_register_xnap(void) {
       { "ActivationIDforCellActivation", "xnap.ActivationIDforCellActivation",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
-    { &hf_xnap_AMF_Set_Information_PDU,
-      { "AMF-Set-Information", "xnap.AMF_Set_Information",
+    { &hf_xnap_AMF_Region_Information_PDU,
+      { "AMF-Region-Information", "xnap.AMF_Region_Information",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_xnap_AssistanceDataForRANPaging_PDU,
       { "AssistanceDataForRANPaging", "xnap.AssistanceDataForRANPaging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_BPLMN_ID_Info_EUTRA_PDU,
+      { "BPLMN-ID-Info-EUTRA", "xnap.BPLMN_ID_Info_EUTRA",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
+    { &hf_xnap_BPLMN_ID_Info_NR_PDU,
+      { "BPLMN-ID-Info-NR", "xnap.BPLMN_ID_Info_NR",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_BitRate_PDU,
       { "BitRate", "xnap.BitRate",
         FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
@@ -12841,6 +13212,10 @@ void proto_register_xnap(void) {
       { "DRB-List", "xnap.DRB_List",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_DRB_List_withCause_PDU,
+      { "DRB-List-withCause", "xnap.DRB_List_withCause",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_DRB_Number_PDU,
       { "DRB-Number", "xnap.DRB_Number",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -12865,6 +13240,10 @@ void proto_register_xnap(void) {
       { "GUAMI", "xnap.GUAMI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_InterfaceInstanceIndication_PDU,
+      { "InterfaceInstanceIndication", "xnap.InterfaceInstanceIndication",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_LocationInformationSNReporting_PDU,
       { "LocationInformationSNReporting", "xnap.LocationInformationSNReporting",
         FT_UINT32, BASE_DEC, VALS(xnap_LocationInformationSNReporting_vals), 0,
@@ -12893,6 +13272,10 @@ void proto_register_xnap(void) {
       { "MR-DC-ResourceCoordinationInfo", "xnap.MR_DC_ResourceCoordinationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_NE_DC_TDM_Pattern_PDU,
+      { "NE-DC-TDM-Pattern", "xnap.NE_DC_TDM_Pattern_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_NG_RAN_Cell_Identity_PDU,
       { "NG-RAN-Cell-Identity", "xnap.NG_RAN_Cell_Identity",
         FT_UINT32, BASE_DEC, VALS(xnap_NG_RAN_Cell_Identity_vals), 0,
@@ -12917,10 +13300,6 @@ void proto_register_xnap(void) {
       { "PDUSession-List-withCause", "xnap.PDUSession_List_withCause",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
-    { &hf_xnap_PDUSession_List_withDataForwardingRequest_PDU,
-      { "PDUSession-List-withDataForwardingRequest", "xnap.PDUSession_List_withDataForwardingRequest",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
     { &hf_xnap_PDUSessionResourcesAdmitted_List_PDU,
       { "PDUSessionResourcesAdmitted-List", "xnap.PDUSessionResourcesAdmitted_List",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -12933,14 +13312,26 @@ void proto_register_xnap(void) {
       { "PDUSessionResourceSecondaryRATUsageList", "xnap.PDUSessionResourceSecondaryRATUsageList",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_PDUSessionCommonNetworkInstance_PDU,
+      { "PDUSessionCommonNetworkInstance", "xnap.PDUSessionCommonNetworkInstance",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_PLMN_Identity_PDU,
       { "PLMN-Identity", "xnap.PLMN_Identity",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_QoSFlows_List_PDU,
+      { "QoSFlows-List", "xnap.QoSFlows_List",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_RANPagingArea_PDU,
       { "RANPagingArea", "xnap.RANPagingArea_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_RANPagingFailure_PDU,
+      { "RANPagingFailure", "xnap.RANPagingFailure",
+        FT_UINT32, BASE_DEC, VALS(xnap_RANPagingFailure_vals), 0,
+        NULL, HFILL }},
     { &hf_xnap_ResetRequestTypeInfo_PDU,
       { "ResetRequestTypeInfo", "xnap.ResetRequestTypeInfo",
         FT_UINT32, BASE_DEC, VALS(xnap_ResetRequestTypeInfo_vals), 0,
@@ -13061,6 +13452,10 @@ void proto_register_xnap(void) {
       { "UEIdentityIndexValue", "xnap.UEIdentityIndexValue",
         FT_UINT32, BASE_DEC, VALS(xnap_UEIdentityIndexValue_vals), 0,
         NULL, HFILL }},
+    { &hf_xnap_UERadioCapabilityForPaging_PDU,
+      { "UERadioCapabilityForPaging", "xnap.UERadioCapabilityForPaging_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_UERANPagingIdentity_PDU,
       { "UERANPagingIdentity", "xnap.UERANPagingIdentity",
         FT_UINT32, BASE_DEC, VALS(xnap_UERANPagingIdentity_vals), 0,
@@ -13069,6 +13464,10 @@ void proto_register_xnap(void) {
       { "UESecurityCapabilities", "xnap.UESecurityCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_UPTransportLayerInformation_PDU,
+      { "UPTransportLayerInformation", "xnap.UPTransportLayerInformation",
+        FT_UINT32, BASE_DEC, VALS(xnap_UPTransportLayerInformation_vals), 0,
+        NULL, HFILL }},
     { &hf_xnap_UserPlaneTrafficActivityReport_PDU,
       { "UserPlaneTrafficActivityReport", "xnap.UserPlaneTrafficActivityReport",
         FT_UINT32, BASE_DEC, VALS(xnap_UserPlaneTrafficActivityReport_vals), 0,
@@ -13197,6 +13596,10 @@ void proto_register_xnap(void) {
       { "PDUSessionNotAdmitted-SNModResponse", "xnap.PDUSessionNotAdmitted_SNModResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_PDUSessionDataForwarding_SNModResponse_PDU,
+      { "PDUSessionDataForwarding-SNModResponse", "xnap.PDUSessionDataForwarding_SNModResponse_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_SNodeModificationRequestReject_PDU,
       { "SNodeModificationRequestReject", "xnap.SNodeModificationRequestReject_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -13493,8 +13896,8 @@ void proto_register_xnap(void) {
       { "pre-emption-vulnerability", "xnap.pre_emption_vulnerability",
         FT_UINT32, BASE_DEC, VALS(xnap_T_pre_emption_vulnerability_vals), 0,
         NULL, HFILL }},
-    { &hf_xnap_AMF_Set_Information_item,
-      { "GlobalAMF-Set-Information", "xnap.GlobalAMF_Set_Information_element",
+    { &hf_xnap_AMF_Region_Information_item,
+      { "GlobalAMF-Region-Information", "xnap.GlobalAMF_Region_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_xnap_plmn_ID,
@@ -13505,10 +13908,6 @@ void proto_register_xnap(void) {
       { "amf-region-id", "xnap.amf_region_id",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_8", HFILL }},
-    { &hf_xnap_amf_set_id,
-      { "amf-set-id", "xnap.amf_set_id",
-        FT_BYTES, BASE_NONE, NULL, 0,
-        "BIT_STRING_SIZE_10", HFILL }},
     { &hf_xnap_AreaOfInterestInformation_item,
       { "AreaOfInterest-Item", "xnap.AreaOfInterest_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -13541,10 +13940,50 @@ void proto_register_xnap(void) {
       { "ran-paging-attempt-info", "xnap.ran_paging_attempt_info_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RANPagingAttemptInfo", HFILL }},
+    { &hf_xnap_BPLMN_ID_Info_EUTRA_item,
+      { "BPLMN-ID-Info-EUTRA-Item", "xnap.BPLMN_ID_Info_EUTRA_Item_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_xnap_broadcastPLMNs,
+      { "broadcastPLMNs", "xnap.broadcastPLMNs",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "BroadcastEUTRAPLMNs", HFILL }},
+    { &hf_xnap_tac,
+      { "tac", "xnap.tac",
+        FT_UINT24, BASE_DEC_HEX, NULL, 0,
+        NULL, HFILL }},
+    { &hf_xnap_e_utraCI,
+      { "e-utraCI", "xnap.e_utraCI",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "E_UTRA_Cell_Identity", HFILL }},
+    { &hf_xnap_ranac,
+      { "ranac", "xnap.ranac",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
+    { &hf_xnap_iE_Extension,
+      { "iE-Extension", "xnap.iE_Extension",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "ProtocolExtensionContainer", HFILL }},
+    { &hf_xnap_BPLMN_ID_Info_NR_item,
+      { "BPLMN-ID-Info-NR-Item", "xnap.BPLMN_ID_Info_NR_Item_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_xnap_broadcastPLMNs_01,
+      { "broadcastPLMNs", "xnap.broadcastPLMNs",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
+    { &hf_xnap_nr_CI,
+      { "nr-CI", "xnap.nr_CI",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "NR_Cell_Identity", HFILL }},
     { &hf_xnap_BroadcastPLMNs_item,
       { "PLMN-Identity", "xnap.PLMN_Identity",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_BroadcastEUTRAPLMNs_item,
+      { "PLMN-Identity", "xnap.PLMN_Identity",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_plmn_id,
       { "plmn-id", "xnap.plmn_id",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -13553,10 +13992,6 @@ void proto_register_xnap(void) {
       { "tAISliceSupport-List", "xnap.tAISliceSupport_List",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SliceSupport_List", HFILL }},
-    { &hf_xnap_iE_Extension,
-      { "iE-Extension", "xnap.iE_Extension",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "ProtocolExtensionContainer", HFILL }},
     { &hf_xnap_radioNetwork,
       { "radioNetwork", "xnap.radioNetwork",
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &xnap_CauseRadioNetworkLayer_vals_ext, 0,
@@ -13801,10 +14236,6 @@ void proto_register_xnap(void) {
       { "qosFlows-List", "xnap.qosFlows_List",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
-    { &hf_xnap_qosFlowMappingIndication,
-      { "qosFlowMappingIndication", "xnap.qosFlowMappingIndication",
-        FT_UINT32, BASE_DEC, VALS(xnap_QoSFlowMappingIndication_vals), 0,
-        NULL, HFILL }},
     { &hf_xnap_priorityLevelQoS,
       { "priorityLevelQoS", "xnap.priorityLevelQoS",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -13973,6 +14404,10 @@ void proto_register_xnap(void) {
       { "gtp-teid", "xnap.gtp_teid",
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_amf_set_id,
+      { "amf-set-id", "xnap.amf_set_id",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_10", HFILL }},
     { &hf_xnap_amf_pointer,
       { "amf-pointer", "xnap.amf_pointer",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -14173,6 +14608,14 @@ void proto_register_xnap(void) {
       { "nr-coordination-assistance-info", "xnap.nr_coordination_assistance_info",
         FT_UINT32, BASE_DEC, VALS(xnap_NR_CoordinationAssistanceInfo_vals), 0,
         "NR_CoordinationAssistanceInfo", HFILL }},
+    { &hf_xnap_subframeAssignment,
+      { "subframeAssignment", "xnap.subframeAssignment",
+        FT_UINT32, BASE_DEC, VALS(xnap_T_subframeAssignment_vals), 0,
+        NULL, HFILL }},
+    { &hf_xnap_harqOffset,
+      { "harqOffset", "xnap.harqOffset",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "INTEGER_0_9", HFILL }},
     { &hf_xnap_NeighbourInformation_E_UTRA_item,
       { "NeighbourInformation-E-UTRA-Item", "xnap.NeighbourInformation_E_UTRA_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -14189,14 +14632,6 @@ void proto_register_xnap(void) {
       { "earfcn", "xnap.earfcn",
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_UTRAARFCN", HFILL }},
-    { &hf_xnap_tac,
-      { "tac", "xnap.tac",
-        FT_UINT24, BASE_DEC_HEX, NULL, 0,
-        NULL, HFILL }},
-    { &hf_xnap_ranac,
-      { "ranac", "xnap.ranac",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
     { &hf_xnap_NeighbourInformation_NR_item,
       { "NeighbourInformation-NR-Item", "xnap.NeighbourInformation_NR_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -14265,7 +14700,7 @@ void proto_register_xnap(void) {
       { "NG-RAN-Cell-Identity", "xnap.NG_RAN_Cell_Identity",
         FT_UINT32, BASE_DEC, VALS(xnap_NG_RAN_Cell_Identity_vals), 0,
         NULL, HFILL }},
-    { &hf_xnap_nr_CI,
+    { &hf_xnap_nr_CI_01,
       { "nr-CI", "xnap.NR-Cell-Identity",
         FT_UINT40, BASE_HEX, NULL, 0,
         "NR_Cell_Identity", HFILL }},
@@ -14545,6 +14980,10 @@ void proto_register_xnap(void) {
       { "mCGRequestedGBRQoSFlowInfo", "xnap.mCGRequestedGBRQoSFlowInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GBRQoSFlowInfo", HFILL }},
+    { &hf_xnap_qosFlowMappingIndication,
+      { "qosFlowMappingIndication", "xnap.qosFlowMappingIndication",
+        FT_UINT32, BASE_DEC, VALS(xnap_QoSFlowMappingIndication_vals), 0,
+        NULL, HFILL }},
     { &hf_xnap_dRBsToBeSetup_01,
       { "dRBsToBeSetup", "xnap.dRBsToBeSetup",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -14869,10 +15308,6 @@ void proto_register_xnap(void) {
       { "QoSFlowsToBeSetup-Item", "xnap.QoSFlowsToBeSetup_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_xnap_dlDataForwarding,
-      { "dlDataForwarding", "xnap.dlDataForwarding",
-        FT_UINT32, BASE_DEC, VALS(xnap_DLForwarding_vals), 0,
-        "DLForwarding", HFILL }},
     { &hf_xnap_e_RAB_ID,
       { "e-RAB-ID", "xnap.e_RAB_ID",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -15013,7 +15448,7 @@ void proto_register_xnap(void) {
       { "e-utra-pci", "xnap.e_utra_pci",
         FT_UINT32, BASE_DEC, NULL, 0,
         "E_UTRAPCI", HFILL }},
-    { &hf_xnap_broadcastPLMNs,
+    { &hf_xnap_broadcastPLMNs_02,
       { "broadcastPLMNs", "xnap.broadcastPLMNs",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxnoofBPLMNs_OF_ServedCellInformation_E_UTRA_perBPLMN", HFILL }},
@@ -15269,7 +15704,7 @@ void proto_register_xnap(void) {
       { "TAISupport-Item", "xnap.TAISupport_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_xnap_broadcastPLMNs_01,
+    { &hf_xnap_broadcastPLMNs_03,
       { "broadcastPLMNs", "xnap.broadcastPLMNs",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_maxnoofsupportedPLMNs_OF_BroadcastPLMNinTAISupport_Item", HFILL }},
@@ -15413,6 +15848,14 @@ void proto_register_xnap(void) {
       { "indexLength10", "xnap.indexLength10",
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING_SIZE_10", HFILL }},
+    { &hf_xnap_uERadioCapabilityForPagingOfNR,
+      { "uERadioCapabilityForPagingOfNR", "xnap.uERadioCapabilityForPagingOfNR",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
+    { &hf_xnap_uERadioCapabilityForPagingOfEUTRA,
+      { "uERadioCapabilityForPagingOfEUTRA", "xnap.uERadioCapabilityForPagingOfEUTRA",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_nr_EncyptionAlgorithms,
       { "nr-EncyptionAlgorithms", "xnap.nr_EncyptionAlgorithms",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -15676,10 +16119,6 @@ void proto_register_xnap(void) {
     { &hf_xnap_pduSessionsToBeReleasedList_SNterminated,
       { "pduSessionsToBeReleasedList-SNterminated", "xnap.pduSessionsToBeReleasedList_SNterminated",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "PDUSession_List_withDataForwardingFromTarget", HFILL }},
-    { &hf_xnap_pduSessionsToBeReleasedList_SNterminated_01,
-      { "pduSessionsToBeReleasedList-SNterminated", "xnap.pduSessionsToBeReleasedList_SNterminated",
-        FT_UINT32, BASE_DEC, NULL, 0,
         "PDUSession_List_withDataForwardingRequest", HFILL }},
     { &hf_xnap_pduSessionsReleasedList_SNterminated,
       { "pduSessionsReleasedList-SNterminated", "xnap.pduSessionsReleasedList_SNterminated",
@@ -15955,7 +16394,7 @@ void proto_register_xnap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-xnap-hfarr.c ---*/
-#line 257 "./asn1/xnap/packet-xnap-template.c"
+#line 259 "./asn1/xnap/packet-xnap-template.c"
   };
 
   /* List of subtrees */
@@ -15971,6 +16410,8 @@ void proto_register_xnap(void) {
     &ett_xnap_LastVisitedNGRANCellInformation,
     &ett_xnap_LastVisitedUTRANCellInformation,
     &ett_xnap_LastVisitedGERANCellInformation,
+    &ett_xnap_UERadioCapabilityForPagingOfNR,
+    &ett_xnap_UERadioCapabilityForPagingOfEUTRA,
 
 /*--- Included file: packet-xnap-ettarr.c ---*/
 #line 1 "./asn1/xnap/packet-xnap-ettarr.c"
@@ -15984,13 +16425,18 @@ void proto_register_xnap(void) {
     &ett_xnap_Additional_UL_NG_U_TNLatUPF_Item,
     &ett_xnap_Additional_UL_NG_U_TNLatUPF_List,
     &ett_xnap_AllocationandRetentionPriority,
-    &ett_xnap_AMF_Set_Information,
-    &ett_xnap_GlobalAMF_Set_Information,
+    &ett_xnap_AMF_Region_Information,
+    &ett_xnap_GlobalAMF_Region_Information,
     &ett_xnap_AreaOfInterestInformation,
     &ett_xnap_AreaOfInterest_Item,
     &ett_xnap_AS_SecurityInformation,
     &ett_xnap_AssistanceDataForRANPaging,
+    &ett_xnap_BPLMN_ID_Info_EUTRA,
+    &ett_xnap_BPLMN_ID_Info_EUTRA_Item,
+    &ett_xnap_BPLMN_ID_Info_NR,
+    &ett_xnap_BPLMN_ID_Info_NR_Item,
     &ett_xnap_BroadcastPLMNs,
+    &ett_xnap_BroadcastEUTRAPLMNs,
     &ett_xnap_BroadcastPLMNinTAISupport_Item,
     &ett_xnap_Cause,
     &ett_xnap_CellAssistanceInfo_NR,
@@ -16068,6 +16514,7 @@ void proto_register_xnap(void) {
     &ett_xnap_NG_RAN_Node_ResourceCoordinationInfo,
     &ett_xnap_E_UTRA_ResourceCoordinationInfo,
     &ett_xnap_NR_ResourceCoordinationInfo,
+    &ett_xnap_NE_DC_TDM_Pattern,
     &ett_xnap_NeighbourInformation_E_UTRA,
     &ett_xnap_NeighbourInformation_E_UTRA_Item,
     &ett_xnap_NeighbourInformation_NR,
@@ -16255,6 +16702,7 @@ void proto_register_xnap(void) {
     &ett_xnap_UEContextInfoRetrUECtxtResp,
     &ett_xnap_UEHistoryInformation,
     &ett_xnap_UEIdentityIndexValue,
+    &ett_xnap_UERadioCapabilityForPaging,
     &ett_xnap_UERANPagingIdentity,
     &ett_xnap_UESecurityCapabilities,
     &ett_xnap_T_nr_EncyptionAlgorithms,
@@ -16308,6 +16756,7 @@ void proto_register_xnap(void) {
     &ett_xnap_PDUSessionAdmittedToBeModifiedSNModResponse_Item,
     &ett_xnap_PDUSessionAdmittedToBeReleasedSNModResponse,
     &ett_xnap_PDUSessionNotAdmitted_SNModResponse,
+    &ett_xnap_PDUSessionDataForwarding_SNModResponse,
     &ett_xnap_SNodeModificationRequestReject,
     &ett_xnap_SNodeModificationRequired,
     &ett_xnap_PDUSessionToBeModifiedSNModRequired,
@@ -16384,7 +16833,7 @@ void proto_register_xnap(void) {
     &ett_xnap_UnsuccessfulOutcome,
 
 /*--- End of included file: packet-xnap-ettarr.c ---*/
-#line 273 "./asn1/xnap/packet-xnap-template.c"
+#line 277 "./asn1/xnap/packet-xnap-template.c"
   };
 
   module_t *xnap_module;
@@ -16432,7 +16881,7 @@ proto_reg_handoff_xnap(void)
   dissector_add_uint("xnap.ies", id_ActivationIDforCellActivation, create_dissector_handle(dissect_ActivationIDforCellActivation_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_admittedSplitSRB, create_dissector_handle(dissect_SplitSRBsTypes_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_admittedSplitSRBrelease, create_dissector_handle(dissect_SplitSRBsTypes_PDU, proto_xnap));
-  dissector_add_uint("xnap.ies", id_AMF_Set_Information, create_dissector_handle(dissect_AMF_Set_Information_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_AMF_Region_Information, create_dissector_handle(dissect_AMF_Region_Information_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_AssistanceDataForRANPaging, create_dissector_handle(dissect_AssistanceDataForRANPaging_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_BearersSubjectToCounterCheck, create_dissector_handle(dissect_BearersSubjectToCounterCheck_List_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_Cause, create_dissector_handle(dissect_Cause_PDU, proto_xnap));
@@ -16533,18 +16982,30 @@ proto_reg_handoff_xnap(void)
   dissector_add_uint("xnap.ies", id_TNLA_Failed_To_Setup_List, create_dissector_handle(dissect_TNLA_Failed_To_Setup_List_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_PDUSessionToBeReleased_RelReqAck, create_dissector_handle(dissect_PDUSessionToBeReleasedList_RelReqAck_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_S_NG_RANnodeMaxIPDataRate_UL, create_dissector_handle(dissect_BitRate_PDU, proto_xnap));
-  dissector_add_uint("xnap.ies", id_PDUSession_List_withDataForwardingRequest, create_dissector_handle(dissect_PDUSession_List_withDataForwardingRequest_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_PDUSessionResourceSecondaryRATUsageList, create_dissector_handle(dissect_PDUSessionResourceSecondaryRATUsageList_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_LocationInformationSNReporting, create_dissector_handle(dissect_LocationInformationSNReporting_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_LocationInformationSN, create_dissector_handle(dissect_Target_CGI_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_S_NG_RANnodeMaxIPDataRate_DL, create_dissector_handle(dissect_BitRate_PDU, proto_xnap));
   dissector_add_uint("xnap.ies", id_MR_DC_ResourceCoordinationInfo, create_dissector_handle(dissect_MR_DC_ResourceCoordinationInfo_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_AMF_Region_Information_To_Add, create_dissector_handle(dissect_AMF_Region_Information_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_AMF_Region_Information_To_Delete, create_dissector_handle(dissect_AMF_Region_Information_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_RANPagingFailure, create_dissector_handle(dissect_RANPagingFailure_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_UERadioCapabilityForPaging, create_dissector_handle(dissect_UERadioCapabilityForPaging_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_PDUSessionDataForwarding_SNModResponse, create_dissector_handle(dissect_PDUSessionDataForwarding_SNModResponse_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_NE_DC_TDM_Pattern, create_dissector_handle(dissect_NE_DC_TDM_Pattern_PDU, proto_xnap));
+  dissector_add_uint("xnap.ies", id_InterfaceInstanceIndication, create_dissector_handle(dissect_InterfaceInstanceIndication_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_Additional_UL_NG_U_TNLatUPF_List, create_dissector_handle(dissect_Additional_UL_NG_U_TNLatUPF_List_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_SecondarydataForwardingInfoFromTarget_List, create_dissector_handle(dissect_SecondarydataForwardingInfoFromTarget_List_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_LastE_UTRANPLMNIdentity, create_dissector_handle(dissect_PLMN_Identity_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_MaxIPrate_DL, create_dissector_handle(dissect_MaxIPrate_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_SecurityResult, create_dissector_handle(dissect_SecurityResult_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_S_NSSAI, create_dissector_handle(dissect_S_NSSAI_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_OldQoSFlowMap_ULendmarkerexpected, create_dissector_handle(dissect_QoSFlows_List_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_DRBsNotAdmittedSetupModifyList, create_dissector_handle(dissect_DRB_List_withCause_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_Secondary_MN_Xn_U_TNLInfoatM, create_dissector_handle(dissect_UPTransportLayerInformation_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_PDUSessionCommonNetworkInstance, create_dissector_handle(dissect_PDUSessionCommonNetworkInstance_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_BPLMN_ID_Info_EUTRA, create_dissector_handle(dissect_BPLMN_ID_Info_EUTRA_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_BPLMN_ID_Info_NR, create_dissector_handle(dissect_BPLMN_ID_Info_NR_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.imsg", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequest_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.sout", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.uout", id_handoverPreparation, create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_xnap));
@@ -16600,7 +17061,7 @@ proto_reg_handoff_xnap(void)
 
 
 /*--- End of included file: packet-xnap-dis-tab.c ---*/
-#line 314 "./asn1/xnap/packet-xnap-template.c"
+#line 318 "./asn1/xnap/packet-xnap-template.c"
   } else {
     if (sctp_port != 0) {
       dissector_delete_uint("sctp.port", sctp_port, xnap_handle);
author	Pascal Quantin <pascal@wireshark.org>	2019-07-19 14:15:32 +0200
committer	Pascal Quantin <pascal@wireshark.org>	2019-07-19 12:46:44 +0000
commit	c7884e217045477a949af26a547fa5ecc83dcad5 (patch)
tree	2b18253f83f9faa50d1587bc115838776db7ea50
parent	dfb147269f3bb54abdf5b515f2e6a5856ff7c6b5 (diff)