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>

8 files changed, 261 insertions, 78 deletions

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