X2AP: upgrade dissector to v16.2.0

Change-Id: I6fc049e0ce07d3938e486c4e6075d70340b3e3e2 Reviewed-on: https://code.wireshark.org/review/38208 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> 2020-08-20 17:08:32 +0200
committer: Pascal Quantin <pascal@wireshark.org> 2020-08-20 21:39:50 +0000
commit: 4707c16adde2e002b82d54202117b1df58a5c215 (patch)
tree: ffc3b69dae3f19455f19cbe97092d9948b9b0ca1 /epan/dissectors/asn1/x2ap
parent: df69e61cb6bc3910975d864175a1f64476fcd25c (diff)
8 files changed, 1680 insertions, 102 deletions
diff --git a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
index 5fb8d194f7..ef710513ab 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V15.9.0 (2020-03)
+-- 3GPP TS 36.423 V16.2.0 (2020-07)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
index 2c48164cbe..f7cc765577 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V15.9.0 (2020-03)
+-- 3GPP TS 36.423 V16.2.0 (2020-07)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -74,6 +74,14 @@ id-gNBStatusIndication											ProcedureCode ::= 45
 id-deactivateTrace												ProcedureCode ::= 46
 id-traceStart													ProcedureCode ::= 47
 id-endcConfigurationTransfer										ProcedureCode ::= 48
+id-handoverSuccess												ProcedureCode ::= 49
+id-conditionalHandoverCancel										ProcedureCode ::= 50
+id-earlyStatusTransfer										ProcedureCode ::= 51
+id-cellTrafficTrace 												ProcedureCode ::= 52
+id-endcresourceStatusReporting									ProcedureCode ::= 53
+id-endcresourceStatusReportingInitiation						ProcedureCode ::= 54
+id-f1CTrafficTransfer											ProcedureCode ::= 55
+
 -- **************************************************************
 --
 -- Lists
@@ -127,8 +135,15 @@ maxnoofNrCellBands							INTEGER ::= 32
 maxnoofBluetoothName						INTEGER ::= 4
 maxnoofWLANName								INTEGER ::= 4
 maxnoofextBPLMNs							INTEGER ::= 12
-maxnoofextBPLMNsminus1						INTEGER ::= 11
-maxnoofBPLMNsminus1							INTEGER ::= 11
+maxnoofTLAs									INTEGER ::= 16
+maxnoofGTPTLAs								INTEGER ::= 16
+maxnoofTNLAssociations						INTEGER ::= 32
+maxnoofCellsinCHO							INTEGER ::= 16
+maxnoofPC5QoSFlows 							INTEGER ::= 2048
+maxnoofSSBAreas								INTEGER ::= 64
+maxnoofNRSCSs								INTEGER ::= 5
+maxnoofPhysicalResourceBlocks				INTEGER ::= 275
+maxnoofNRPhysicalResourceBlocks				INTEGER ::= 275
 
 -- **************************************************************
 --
@@ -480,27 +495,65 @@ id-BPLMN-ID-Info-EUTRA														ProtocolIE-ID ::= 336
 id-BPLMN-ID-Info-NR															ProtocolIE-ID ::= 337
 id-NBIoT-UL-DL-AlignmentOffset												ProtocolIE-ID ::= 338
 id-ERABs-transferred-to-MeNB												ProtocolIE-ID ::= 339
---WS extension
-id-Unknown-340																ProtocolIE-ID ::= 340
-id-Unknown-341																ProtocolIE-ID ::= 341
-id-Unknown-342																ProtocolIE-ID ::= 342
-id-Unknown-343																ProtocolIE-ID ::= 343
-id-Unknown-344																ProtocolIE-ID ::= 344
-id-Unknown-345																ProtocolIE-ID ::= 345
-id-Unknown-346																ProtocolIE-ID ::= 346
-id-Unknown-347																ProtocolIE-ID ::= 347
-id-Unknown-348																ProtocolIE-ID ::= 348
-id-Unknown-349																ProtocolIE-ID ::= 349
-id-Unknown-350																ProtocolIE-ID ::= 350
-id-Unknown-351																ProtocolIE-ID ::= 351
-id-Unknown-352																ProtocolIE-ID ::= 352
-id-Unknown-353																ProtocolIE-ID ::= 353
-id-Unknown-354																ProtocolIE-ID ::= 354
-id-Unknown-355																ProtocolIE-ID ::= 355
-id-Unknown-356																ProtocolIE-ID ::= 356
-id-Unknown-357																ProtocolIE-ID ::= 357
-id-Unknown-358																ProtocolIE-ID ::= 358
-id-Unknown-359																ProtocolIE-ID ::= 359
+id-AdditionalRRMPriorityIndex												ProtocolIE-ID ::= 340
+id-LowerLayerPresenceStatusChange											ProtocolIE-ID ::= 341
+id-FastMCGRecovery-SN-to-MN													ProtocolIE-ID ::= 342
+id-RequestedFastMCGRecoveryViaSRB3											ProtocolIE-ID ::= 343
+id-AvailableFastMCGRecoveryViaSRB3											ProtocolIE-ID ::= 344
+id-RequestedFastMCGRecoveryViaSRB3Release									ProtocolIE-ID ::= 345
+id-ReleaseFastMCGRecoveryViaSRB3									ProtocolIE-ID ::= 346
+id-FastMCGRecovery-MN-to-SN													ProtocolIE-ID ::= 347
+id-PartialListIndicator														ProtocolIE-ID ::= 348
+id-MaximumCellListSize														ProtocolIE-ID ::= 349
+id-MessageOversizeNotification												ProtocolIE-ID ::= 350
+id-CellandCapacityAssistInfo												ProtocolIE-ID ::= 351
+id-TNLConfigurationInfo														ProtocolIE-ID ::= 352
+id-TNLA-To-Add-List															ProtocolIE-ID ::= 353
+id-TNLA-To-Update-List														ProtocolIE-ID ::= 354
+id-TNLA-To-Remove-List														ProtocolIE-ID ::= 355
+id-TNLA-Setup-List															ProtocolIE-ID ::= 356
+id-TNLA-Failed-To-Setup-List													ProtocolIE-ID ::= 357
+id-UnlicensedSpectrumRestriction												ProtocolIE-ID ::= 358
+id-UEContextReferenceatSourceNGRAN											ProtocolIE-ID ::= 359
 id-EPCHandoverRestrictionListContainer										ProtocolIE-ID ::= 360
+id-CHOinformation-REQ													ProtocolIE-ID ::= 361
+id-CHOinformation-ACK													ProtocolIE-ID ::= 362
+id-DAPSRequestInfo															ProtocolIE-ID ::= 363
+id-RequestedTargetCellID													ProtocolIE-ID ::= 364
+id-CandidateCellsToBeCancelledList											ProtocolIE-ID ::= 365
+id-DAPSResponseInfo															ProtocolIE-ID ::= 366
+id-ProcedureStage															ProtocolIE-ID ::= 367
+id-CHO-DC-Indicator															ProtocolIE-ID ::= 368
+id-Ethernet-Type															ProtocolIE-ID ::= 369
+id-NRV2XServicesAuthorized												ProtocolIE-ID ::= 370
+id-NRUESidelinkAggregateMaximumBitRate										ProtocolIE-ID ::= 371
+id-PC5QoSParameters															ProtocolIE-ID ::= 372
+id-NPRACHConfiguration														ProtocolIE-ID ::= 373
+id-NBIoT-RLF-Report-Container												ProtocolIE-ID ::= 374
+id-MDTConfigurationNR														ProtocolIE-ID ::= 375
+id-PrivacyIndicator															ProtocolIE-ID ::= 376
+id-TraceCollectionEntityIPAddress											ProtocolIE-ID ::= 377
+id-UERadioCapabilityID														ProtocolIE-ID ::= 378
+id-SNtriggered																ProtocolIE-ID ::= 379
+id-CSI-RSTransmissionIndication												ProtocolIE-ID ::= 380
+id-DLCarrierList															ProtocolIE-ID ::= 381
+id-TargetCellInNGRAN														ProtocolIE-ID ::= 382
+id-eNB-Measurement-ID-ENDC													ProtocolIE-ID ::= 383
+id-engNB-Measurement-ID-ENDC												ProtocolIE-ID ::= 384
+id-TDDULDLConfigurationCommonNR												ProtocolIE-ID ::= 385
+id-CarrierList																ProtocolIE-ID ::= 386
+id-ULCarrierList															ProtocolIE-ID ::= 387
+id-FrequencyShift7p5khz														ProtocolIE-ID ::= 388
+id-SSB-PositionsInBurst														ProtocolIE-ID ::= 389
+id-NRCellPRACHConfig														ProtocolIE-ID ::= 390
+id-CellToReport-ENDC														ProtocolIE-ID ::= 391
+id-CellToReport-ENDC-Item													ProtocolIE-ID ::= 392
+id-CellMeasurementResult-ENDC												ProtocolIE-ID ::= 393
+id-CellMeasurementResult-ENDC-Item											ProtocolIE-ID ::= 394
+id-IABNodeIndication														ProtocolIE-ID ::= 395
+id-QoS-Mapping-Information													ProtocolIE-ID ::= 396
+id-F1CTrafficContainer														ProtocolIE-ID ::= 397
+id-IABInformation															ProtocolIE-ID ::= 398
+
 
 END
diff --git a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
index 646ce0c335..49990e47f5 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V15.9.0 (2020-03)
+-- 3GPP TS 36.423 V16.2.0 (2020-07)
 -- 9.3.8	Container definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
index af0bdfe726..89ecff0d1d 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V15.9.0 (2020-03)
+-- 3GPP TS 36.423 V16.2.0 (2020-07)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -76,6 +76,13 @@ IMPORTS
 	id-LastNG-RANPLMNIdentity,
 	id-BPLMN-ID-Info-EUTRA,
 	id-NBIoT-UL-DL-AlignmentOffset,
+	id-UnlicensedSpectrumRestriction,
+	id-CarrierList,
+	id-FrequencyShift7p5khz,
+	id-NPRACHConfiguration,
+	id-MDTConfigurationNR,
+	id-CSI-RSTransmissionIndication,
+	id-QoS-Mapping-Information,
 
 	maxnoofBearers,
 	maxCellineNB,
@@ -121,8 +128,15 @@ IMPORTS
 	maxnoofWLANName,
 	maxofNRNeighbours,
 	maxnoofextBPLMNs,
-	maxnoofextBPLMNsminus1,
-	maxnoofBPLMNsminus1
+	maxnoofTLAs,
+	maxnoofGTPTLAs,
+	maxnoofTNLAssociations,
+	maxnoofCellsinCHO,	maxnoofPC5QoSFlows,
+	maxnoofSSBAreas,
+	maxnoofNRSCSs,
+	maxnoofPhysicalResourceBlocks,
+	maxnoofNRPhysicalResourceBlocks
+
 
 FROM X2AP-Constants
 
@@ -185,6 +199,8 @@ ABS-Status-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 ActivationID ::= INTEGER (0..255)
 
+AdditionalRRMPriorityIndex ::= BIT STRING (SIZE(32))
+
 AdditionalSpecialSubframe-Info ::=		SEQUENCE {
 	additionalspecialSubframePatterns		AdditionalSpecialSubframePatterns,
 	cyclicPrefixDL							CyclicPrefixDL,
@@ -228,6 +244,8 @@ AdditionalSpecialSubframePatternsExtension ::= ENUMERATED {
 	...
 }
 
+AvailableFastMCGRecoveryViaSRB3 ::= ENUMERATED {true,...}
+
 AerialUEsubscriptionInformation ::= ENUMERATED {
 	allowed,
 	not-allowed,
@@ -311,7 +329,7 @@ BluetoothMeasConfig::= ENUMERATED {setup,...}
 
 BluetoothName ::= OCTET STRING (SIZE (1..248))
 
-BPLMN-ID-Info-EUTRA ::= SEQUENCE (SIZE(1..maxnoofBPLMNsminus1)) OF BPLMN-ID-Info-EUTRA-Item
+BPLMN-ID-Info-EUTRA ::= SEQUENCE (SIZE(1..maxnoofBPLMNs)) OF BPLMN-ID-Info-EUTRA-Item
 
 BPLMN-ID-Info-EUTRA-Item ::= SEQUENCE {
 	broadcastPLMNs					BroadcastPLMNs-Item,
@@ -325,11 +343,11 @@ BPLMN-ID-Info-EUTRA-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-BPLMN-ID-Info-NR ::= SEQUENCE (SIZE(1..maxnoofextBPLMNsminus1)) OF BPLMN-ID-Info-NR-Item
+BPLMN-ID-Info-NR ::= SEQUENCE (SIZE(1..maxnoofextBPLMNs)) OF BPLMN-ID-Info-NR-Item
 
 BPLMN-ID-Info-NR-Item ::= SEQUENCE {
 	broadcastPLMNs					BroadcastextPLMNs,
-	fiveGStac						FiveGS-TAC		OPTIONAL,
+	fiveGS-TAC						FiveGS-TAC		OPTIONAL,
 	nr-CI							NRCellIdentifier,
 	iE-Extension					ProtocolExtensionContainer { {BPLMN-ID-Info-NR-Item-ExtIEs} } OPTIONAL,
 	...
@@ -425,7 +443,9 @@ CauseRadioNetwork ::= ENUMERATED {
 	sCG-Mobility,
 	count-reaches-max-value,
 	unknown-old-en-gNB-UE-X2AP-ID,
-	pDCP-Overload
+	pDCP-Overload,
+	cho-cpc-resources-tobechanged
+
 
 }
 
@@ -488,6 +508,8 @@ CellType-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+CHO-DC-Indicator ::= ENUMERATED {true, ...}
+
 CNTypeRestrictions ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF CNTypeRestrictionsItem
 
 CNTypeRestrictionsItem ::= SEQUENCE {
@@ -617,6 +639,12 @@ CoverageModification-Item ::= SEQUENCE {
 	...
 }
 
+CPTransportLayerInformation		::= CHOICE {
+	endpointIPAddress						TransportLayerAddress,
+	endpointIPAddressAndPort					TransportLayerAddressAndPort,
+	...
+}
+
 CriticalityDiagnostics ::= SEQUENCE {
 	procedureCode					ProcedureCode					OPTIONAL,
 	triggeringMessage				TriggeringMessage				OPTIONAL,
@@ -703,6 +731,47 @@ CyclicPrefixUL ::= ENUMERATED {
 	...
 }
 
+CHOtrigger ::= ENUMERATED {
+	cho-initiation,
+	cho-replace,
+	...
+}
+
+CHOinformation-REQ ::= SEQUENCE {
+	cho-trigger						CHOtrigger,
+	new-eNB-UE-X2AP-ID				UE-X2AP-ID											OPTIONAL
+		-- This IE shall be present if the cho-trigger IE is present and set to "CHO-replace" --,
+	new-eNB-UE-X2AP-ID-Extension	UE-X2AP-ID-Extension								OPTIONAL,
+	cHO-EstimatedArrivalProbability	CHO-Probability										OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { { CHOinformation-REQ-ExtIEs} }	OPTIONAL,
+	...
+}
+
+CHOinformation-REQ-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
+	...
+}
+
+CHOinformation-ACK ::= SEQUENCE {
+	requestedTargetCellID			ECGI,
+	maxCHOpreparations				MaxCHOpreparations											OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { CHOinformation-ACK-ExtIEs} }	OPTIONAL,
+	...
+}
+
+CHOinformation-ACK-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
+	...
+}
+
+
+CandidateCellsToBeCancelledList ::= SEQUENCE (SIZE (1..maxnoofCellsinCHO)) OF ECGI
+
+CHO-Probability ::= INTEGER (1..100)
+
+CSI-RSTransmissionIndication ::= ENUMERATED {
+	activated,
+	deactivated,
+	...
+}
 
 -- D
 
@@ -721,6 +790,25 @@ DataTrafficResourceIndication-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+DAPSRequestInfo ::= SEQUENCE {
+	dAPSIndicator				ENUMERATED {daps-HO-required, ...},
+	iE-Extensions				ProtocolExtensionContainer { {DAPSRequestInfo-ExtIEs} } OPTIONAL,
+	...
+}
+
+DAPSRequestInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+DAPSResponseInfo ::= SEQUENCE {
+	dAPSResponseIndicator					ENUMERATED { daps-HO-accepted, daps-HO-not-accepted,...},
+	iE-Extensions				ProtocolExtensionContainer { { DAPSResponseInfo-ExtIEs} } OPTIONAL,
+	...
+}
+
+DAPSResponseInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 DeactivationIndication::= ENUMERATED {
 	deactivated,
 	...
@@ -848,7 +936,7 @@ EN-DC-ResourceConfigurationExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 }
 
 EPCHandoverRestrictionListContainer ::= OCTET STRING
--- The octets of the OCTET STRING contain the Handover Restriction List IE as specified in TS 36.413 [4]. --
+-- This octets of the OCTET STRING contain the Handover Restriction List IE as specified in TS 36.413 [4]. --
 
 EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity
 
@@ -900,6 +988,37 @@ E-RAB-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+E-RABsSubjectToEarlyStatusTransfer-List ::= SEQUENCE (SIZE (1.. maxnoofBearers)) OF E-RABsSubjectToEarlyStatusTransfer-Item
+
+E-RABsSubjectToEarlyStatusTransfer-Item ::= SEQUENCE {
+	e-RAB-ID											E-RAB-ID,
+	fIRST-DL-COUNTValue									COUNTvalue,
+	fIRST-DL-COUNTValueExtended							COUNTValueExtended													OPTIONAL,
+	fIRST-DL-COUNTValueforPDCPSNLength18				COUNTvaluePDCP-SNlength18													OPTIONAL,
+	iE-Extension		ProtocolExtensionContainer { { E-RABsSubjectToEarlyStatusTransfer-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+E-RABsSubjectToEarlyStatusTransfer-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+E-RABsSubjectToDLDiscarding-List ::= SEQUENCE (SIZE (1.. maxnoofBearers)) OF E-RABsSubjectToDLDiscarding-Item
+
+E-RABsSubjectToDLDiscarding-Item ::= SEQUENCE {
+	e-RAB-ID											E-RAB-ID,
+	dISCARD-DL-COUNTValue								COUNTvalue,
+	dISCARD-DL-COUNTValueExtended						COUNTValueExtended													OPTIONAL,
+	dISCARD-DL-COUNTValueforPDCPSNLength18				COUNTvaluePDCP-SNlength18													OPTIONAL,
+	iE-Extension		ProtocolExtensionContainer { { E-RABsSubjectToDLDiscarding-Item-ExtIEs} }					OPTIONAL,
+	...
+}
+
+E-RABsSubjectToDLDiscarding-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 E-RABUsageReportList ::= SEQUENCE (SIZE(1..maxnooftimeperiods)) OF ProtocolIE-Single-Container { {E-RABUsageReport-ItemIEs} }
 
 E-RABUsageReport-ItemIEs X2AP-PROTOCOL-IES ::= {
@@ -920,6 +1039,11 @@ E-RABUsageReport-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Ethernet-Type ::= ENUMERATED {
+	true,
+	...
+}
+
 EUTRA-Mode-Info ::= CHOICE {
 	fDD		FDD-Info,
 	tDD		TDD-Info,
@@ -982,6 +1106,18 @@ ExtendedBitRate	::= INTEGER (10000000001..4000000000000,...)
 
 -- F
 
+F1CTrafficContainer ::= OCTET STRING
+
+FastMCGRecovery	::= SEQUENCE {
+	rrcContainer 				RRCContainer			OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { {FastMCGRecovery-ExtIEs} } OPTIONAL,
+	...
+}
+
+FastMCGRecovery-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 FDD-Info ::= SEQUENCE {
 	uL-EARFCN						EARFCN,
 	dL-EARFCN						EARFCN,
@@ -1012,6 +1148,8 @@ FDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+FiveQI ::= INTEGER (0..255, ...)
+
 ForbiddenInterRATs ::= ENUMERATED {
 	all,
 	geran,
@@ -1075,6 +1213,9 @@ FreqBandNrItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+FrequencyShift7p5khz ::= ENUMERATED {false, true, ...}
+
+
 -- G
 
 GBR-QosInformation ::= SEQUENCE {
@@ -1119,6 +1260,19 @@ GlobalGNB-ID-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 GNBOverloadInformation ::= ENUMERATED {overloaded, not-overloaded, ...}
 
+GTPTLAs	::= SEQUENCE (SIZE(1.. maxnoofGTPTLAs)) OF	GTPTLA-Item
+
+
+GTPTLA-Item	::= SEQUENCE {
+	gTPTransportLayerAddresses			TransportLayerAddress,
+	iE-Extensions						ProtocolExtensionContainer { { GTPTLA-Item-ExtIEs } } OPTIONAL,
+	...
+}
+
+GTPTLA-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 GTPtunnelEndpoint ::= SEQUENCE {
 	transportLayerAddress			TransportLayerAddress,
 	gTP-TEID						GTP-TEI,
@@ -1127,6 +1281,7 @@ GTPtunnelEndpoint ::= SEQUENCE {
 }
 
 GTPtunnelEndpoint-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ID id-QoS-Mapping-Information	CRITICALITY reject	EXTENSION QoS-Mapping-Information	PRESENCE optional},
 	...
 }
 
@@ -1171,7 +1326,8 @@ HandoverReportType ::= ENUMERATED {
 	hoTooEarly,
 	hoToWrongCell,
 	...,
-	interRATpingpong
+	interRATpingpong,
+	interSystemPingpong
 }
 
 HandoverRestrictionList ::= SEQUENCE {
@@ -1188,7 +1344,8 @@ HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-NRrestrictioninEPSasSecondaryRAT			CRITICALITY ignore	EXTENSION NRrestrictioninEPSasSecondaryRAT			PRESENCE optional}|
 	{ ID id-CNTypeRestrictions						CRITICALITY ignore	EXTENSION CNTypeRestrictions								PRESENCE optional}|
 	{ ID id-NRrestrictionin5GS						CRITICALITY ignore	EXTENSION NRrestrictionin5GS								PRESENCE optional}|
-	{ ID id-LastNG-RANPLMNIdentity					CRITICALITY ignore	EXTENSION PLMN-Identity										PRESENCE optional},
+	{ ID id-LastNG-RANPLMNIdentity					CRITICALITY ignore	EXTENSION PLMN-Identity										PRESENCE optional}|
+	{ ID id-UnlicensedSpectrumRestriction			CRITICALITY ignore	EXTENSION UnlicensedSpectrumRestriction				PRESENCE optional},
 	...
 }
 
@@ -1212,6 +1369,18 @@ HWLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 -- I
 
+IABInformation ::= SEQUENCE {
+	rrcContainer	RRCContainer 		OPTIONAL,
+	ie-Extensions	ProtocolExtensionContainer { {IABInformation-ExtIEs} } OPTIONAL,
+	...
+}
+
+IABInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+IABNodeIndication ::= ENUMERATED {true,...}
+
 IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16, ...))
 
 InterfaceInstanceIndication ::= INTEGER (0..255, ...)
@@ -1306,6 +1475,14 @@ LocationReportingInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::={
 	...
 }
 
+LowerLayerPresenceStatusChange ::= ENUMERATED {
+	release-lower-layers,
+	re-establish-lower-layers,
+	suspend-lower-layers,
+	resume-lower-layers,
+	...
+}
+
 -- M
 
 M1PeriodicReporting ::= SEQUENCE {
@@ -1411,6 +1588,8 @@ ManagementBasedMDTallowed ::= ENUMERATED {allowed, ...}
 
 Masked-IMEISV ::= BIT STRING (SIZE (64))
 
+MaxCHOpreparations ::= INTEGER(1..16, ...)
+
 MDT-Activation		::= ENUMERATED {
 	immediate-MDT-only,
 	immediate-MDT-and-Trace,
@@ -1449,6 +1628,9 @@ MDT-Location-Info ::= BIT STRING (SIZE (8))
 
 Measurement-ID	::= INTEGER (1..4095, ...)
 
+Measurement-ID-ENDC	::= INTEGER (1..4095, ...)
+
+
 MeasurementsToActivate::= BIT STRING (SIZE (8))
 
 MeasurementThresholdA2 ::= CHOICE {
@@ -1500,6 +1682,8 @@ MBSFN-Subframe-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+MDT-ConfigurationNR ::= OCTET STRING
+
 MobilityParametersModificationRange ::= SEQUENCE {
 	handoverTriggerChangeLowerLimit		INTEGER (-20..20),
 	handoverTriggerChangeUpperLimit		INTEGER (-20..20),
@@ -1513,6 +1697,17 @@ MobilityParametersInformation ::= SEQUENCE {
 
 MultibandInfoList ::= SEQUENCE (SIZE(1..maxnoofBands)) OF BandInfo
 
+MessageOversizeNotification ::= SEQUENCE {
+	maximumCellListSize								MaximumCellListSize,
+	iE-Extensions					ProtocolExtensionContainer { {MessageOversizeNotification-ExtIEs} } 	OPTIONAL,
+	...
+}
+
+MessageOversizeNotification-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+MaximumCellListSize ::= INTEGER(1..16384, ...)
 
 BandInfo	::= SEQUENCE {
 	freqBandIndicator		FreqBandIndicator,
@@ -1549,6 +1744,8 @@ NBIoT-UL-DL-AlignmentOffset ::= ENUMERATED {
 	...
 }
 
+NBIoT-RLF-Report-Container ::= OCTET STRING
+
 Neighbour-Information ::= SEQUENCE (SIZE (0..maxnoofNeighbours)) OF SEQUENCE {
 	eCGI						ECGI,
 	pCI							PCI,
@@ -1574,6 +1771,57 @@ Number-of-Antennaports ::= ENUMERATED {
 		...
 }
 
+NRCapacityValue					::= SEQUENCE {
+	capacityValue						INTEGER (0..100),
+	ssbAreaCapacityValue-List			SSBAreaCapacityValue-List							OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { NRCapacityValue-ExtIEs} } OPTIONAL,
+	...
+}
+
+NRCapacityValue-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NRCarrierList ::= SEQUENCE (SIZE(1..maxnoofNRSCSs)) OF NRCarrierItem
+
+NRCarrierItem ::= SEQUENCE {
+	carrierSCS					NRSCS,
+	offsetToCarrier				INTEGER (0..2199, ...),
+	carrierBandwidth			INTEGER (0..maxnoofPhysicalResourceBlocks, ...),
+	iE-Extension		ProtocolExtensionContainer { {NRCarrierItem-ExtIEs} } 		OPTIONAL,
+	...
+}
+
+NRCarrierItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NRCellCapacityClassValue ::= INTEGER (1..100, ...)
+
+NRCellPRACHConfig ::= OCTET STRING
+
+NRCompositeAvailableCapacityGroup	::= SEQUENCE {
+	compositeAvailableCapacityDL		NRCompositeAvailableCapacity,
+	compositeAvailableCapacityUL		NRCompositeAvailableCapacity,
+	iE-Extensions						ProtocolExtensionContainer { {NRCompositeAvailableCapacityGroup-ExtIEs} } OPTIONAL,
+	...
+}
+
+NRCompositeAvailableCapacityGroup-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NRCompositeAvailableCapacity ::= SEQUENCE {
+	cellCapacityClassValue				NRCellCapacityClassValue							OPTIONAL,
+	capacityValue						NRCapacityValue,
+	iE-Extensions						ProtocolExtensionContainer { {NRCompositeAvailableCapacity-ExtIEs} } OPTIONAL,
+	...
+}
+
+NRCompositeAvailableCapacity-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 NRFreqInfo ::= SEQUENCE{
 	nRARFCN			INTEGER (0.. 3279165),
 	freqBandListNr	SEQUENCE (SIZE(1..maxnoofNrCellBands)) OF FreqBandNrItem,
@@ -1584,6 +1832,7 @@ NRFreqInfo ::= SEQUENCE{
 }
 
 NRFreqInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-FrequencyShift7p5khz			CRITICALITY ignore	EXTENSION FrequencyShift7p5khz	PRESENCE optional},
 	...
 }
 
@@ -1616,9 +1865,79 @@ NRNeighbour-Information ::= SEQUENCE (SIZE (1.. maxofNRNeighbours))OF SEQUENCE {
 }
 
 NRNeighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ID id-CSI-RSTransmissionIndication		CRITICALITY reject	EXTENSION EARFCNExtension	PRESENCE optional},
+	...
+}
+
+NPRACHConfiguration::= SEQUENCE {
+	fdd-or-tdd				CHOICE {
+		fdd			NPRACHConfiguration-FDD,
+		tdd			NPRACHConfiguration-TDD,
+		...
+	},	iE-Extensions						ProtocolExtensionContainer { { NPRACHConfiguration-ExtIEs} }	OPTIONAL,
+...
+}
+
+NPRACHConfiguration-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NPRACHConfiguration-FDD::= SEQUENCE {
+	nprach-CP-length						NPRACH-CP-Length,
+	anchorCarrier-NPRACHConfig						OCTET STRING,
+	anchorCarrier-EDT-NPRACHConfig 					OCTET STRING 						OPTIONAL,
+	anchorCarrier-Format2-NPRACHConfig				OCTET STRING						OPTIONAL,
+	anchorCarrier-Format2-EDT-NPRACHConfig			OCTET STRING 						OPTIONAL,
+	non-anchorCarrier-NPRACHConfig					OCTET STRING 						OPTIONAL,
+	non-anchorCarrier-Format2-NPRACHConfig			OCTET STRING 						OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { { NPRACHConfiguration-FDD-ExtIEs} }	OPTIONAL,
+
+...
+}
+
+NPRACHConfiguration-FDD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NPRACHConfiguration-TDD::= SEQUENCE {
+	nprach-preambleFormat							NPRACH-preambleFormat,
+	anchorCarrier-NPRACHConfigTDD					OCTET STRING,
+	non-anchorCarrierFequencyConfiglist				Non-AnchorCarrierFrequencylist 		OPTIONAL,
+	non-anchorCarrier-NPRACHConfigTDD				OCTET STRING 						OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { { NPRACHConfiguration-TDD-ExtIEs} }	OPTIONAL,
+
+...
+}
+
+NPRACHConfiguration-TDD-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NPRACH-CP-Length::=		ENUMERATED {
+	us66dot7,
+	us266dot7,
+	...
+}
+
+NPRACH-preambleFormat::= 	ENUMERATED {fmt0,fmt1,fmt2,fmt0a,fmt1a,...}
+
+-- WS modification: define a dedicated type for dissection
+Non-anchorCarrierFrequency ::= OCTET STRING
+
+Non-AnchorCarrierFrequencylist ::= SEQUENCE (SIZE(1..15)) OF
+	SEQUENCE {
+-- WS modification: define a dedicated type for dissection
+--		non-anchorCarrioerFrquency		OCTET STRING,
+		non-anchorCarrioerFrquency		Non-anchorCarrierFrequency,
+		iE-Extensions					ProtocolExtensionContainer { { Non-AnchorCarrierFrequencylist-ExtIEs} } OPTIONAL,
+		...
+	}
+
+Non-AnchorCarrierFrequencylist-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+
 NRPCI ::= INTEGER (0..1007)
 
 NRrestrictioninEPSasSecondaryRAT ::= ENUMERATED {
@@ -1626,6 +1945,17 @@ NRrestrictioninEPSasSecondaryRAT ::= ENUMERATED {
 	...
 }
 
+NRRadioResourceStatus	::= SEQUENCE {
+	ssbAreaRadioResourceStatus-List		SSBAreaRadioResourceStatus-List,
+	iE-Extensions						ProtocolExtensionContainer { {NRRadioResourceStatus-ExtIEs} } OPTIONAL,
+	...
+}
+
+NRRadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 NRrestrictionin5GS ::= ENUMERATED {
 	nRrestrictedin5GS,
 	...
@@ -1663,6 +1993,16 @@ NRUeReport-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+NRUESidelinkAggregateMaximumBitRate ::= SEQUENCE {
+	uESidelinkAggregateMaximumBitRate		BitRate,
+	iE-Extensions					ProtocolExtensionContainer { { NRUESidelinkAggregateMaximumBitRate-ExtIEs} } OPTIONAL,
+	...
+}
+
+NRUESidelinkAggregateMaximumBitRate-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 NRUESecurityCapabilities ::= SEQUENCE {
 	nRencryptionAlgorithms				NRencryptionAlgorithms,
 	nRintegrityProtectionAlgorithms		NRintegrityProtectionAlgorithms,
@@ -1676,6 +2016,17 @@ NRUESecurityCapabilities-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 NSSS-NumOccasionDifferentPrecoder ::= ENUMERATED { two, four, eight, ...}
 
+NRV2XServicesAuthorized ::= SEQUENCE {
+	vehicleUE			VehicleUE														OPTIONAL,
+    pedestrianUE 		PedestrianUE													OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { {NRV2XServicesAuthorized-ExtIEs} }	OPTIONAL,
+	...
+}
+
+NRV2XServicesAuthorized-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 -- O
 
 OffsetOfNbiotChannelNumberToEARFCN ::= ENUMERATED {
@@ -1725,6 +2076,42 @@ PA-Values ::= ENUMERATED {
 	...
 }
 
+PC5QoSParameters ::= SEQUENCE {
+	pc5QoSFlowList				PC5QoSFlowList,
+	pc5LinkAggregatedBitRates	BitRate				OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { { PC5QoSParameters-ExtIEs} }	OPTIONAL,
+	...
+}
+
+PC5QoSParameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+    ...
+}
+
+PC5QoSFlowList ::= SEQUENCE (SIZE(1..maxnoofPC5QoSFlows)) OF PC5QoSFlowItem
+
+PC5QoSFlowItem::= SEQUENCE {
+	pQI							FiveQI,
+	pc5FlowBitRates				PC5FlowBitRates				OPTIONAL,
+	range						Range						OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { { PC5QoSFlowItem-ExtIEs} }	OPTIONAL,
+	...
+}
+
+PC5QoSFlowItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+             ...
+}
+
+PC5FlowBitRates ::= SEQUENCE {
+	guaranteedFlowBitRate		BitRate,
+	maximumFlowBitRate		BitRate,
+	iE-Extensions		ProtocolExtensionContainer { { PC5FlowBitRates-ExtIEs} }	OPTIONAL,
+	...
+}
+
+PC5FlowBitRates-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+             ...
+}
+
 PDCPChangeIndication ::= ENUMERATED {s-KgNB-update-required, pDCP-data-recovery-required,...}
 
 PDCP-SN ::= INTEGER (0..4095)
@@ -1850,10 +2237,29 @@ ProtectedResourceList-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+PartialListIndicator ::= ENUMERATED {partial, ...}
+
+PrivacyIndicator ::= ENUMERATED {
+	immediate-MDT,
+	logged-MDT,
+	...
+}
+
 -- Q
 
 QCI ::= INTEGER (0..255)
 
+QoS-Mapping-Information ::= SEQUENCE {
+dscp							BIT STRING (SIZE(6))			OPTIONAL,
+flow-label						BIT STRING (SIZE(20))		OPTIONAL,
+iE-Extensions					ProtocolExtensionContainer { {QoS-Mapping-Information-ExtIEs} }	OPTIONAL,
+...
+}
+
+QoS-Mapping-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 -- R
 
 RadioframeAllocationOffset ::= INTEGER (0..7, ...)
@@ -1886,12 +2292,18 @@ RadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Range ::= ENUMERATED {m50, m80, m180, m200, m350, m400, m500, m700, m1000, ...}
+
+RAN-UE-NGAP-ID ::= INTEGER (0..4294967295)
+
 ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
 
 ReceiveStatusOfULPDCPSDUsExtended ::= BIT STRING (SIZE(1..16384))
 
 ReceiveStatusOfULPDCPSDUsPDCP-SNlength18 ::= BIT STRING (SIZE(1..131072))
 
+ReleaseFastMCGRecoveryViaSRB3 ::= ENUMERATED {true,...}
+
 Reestablishment-Indication ::= ENUMERATED {
 	reestablished,
 	...
@@ -1905,6 +2317,14 @@ Registration-Request	::= ENUMERATED {
 	add
 }
 
+Registration-Request-ENDC	::= ENUMERATED {
+	start,
+	stop,
+	add,
+	...
+}
+
+
 RelativeNarrowbandTxPower ::= SEQUENCE {
 
 	rNTP-PerPRB							BIT STRING (SIZE(6..110, ...)),
@@ -1946,6 +2366,8 @@ ReportingPeriodicityCSIR ::= ENUMERATED {
 ...
 }
 
+ReportCharacteristics-ENDC	::= BIT STRING (SIZE (32))
+
 ReportingPeriodicityRSRPMR ::= ENUMERATED {
 	one-hundred-20-ms,
 	two-hundred-40-ms,
@@ -1956,6 +2378,10 @@ ReportingPeriodicityRSRPMR ::= ENUMERATED {
 
 ReportIntervalMDT ::= ENUMERATED {ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240, min1, min6, min12, min30, min60}
 
+RequestedFastMCGRecoveryViaSRB3 ::= ENUMERATED {true,...}
+
+RequestedFastMCGRecoveryViaSRB3Release ::= ENUMERATED {true,...}
+
 ReservedSubframePattern ::= SEQUENCE{
 	subframeType					SubframeType,
 	reservedSubframePattern			BIT STRING (SIZE(10..160)),
@@ -2087,7 +2513,7 @@ SecondaryRATUsageReport-ItemIEs	X2AP-PROTOCOL-IES ::= {
 
 SecondaryRATUsageReport-Item ::= SEQUENCE {
 	e-RAB-ID						E-RAB-ID,
-	secondaryRATType				ENUMERATED {nr, ...},
+	secondaryRATType				ENUMERATED {nr, ..., nR-unlicensed },
 	e-RABUsageReportList			E-RABUsageReportList,
 	iE-Extensions				ProtocolExtensionContainer { {SecondaryRATUsageReport-Item-ExtIEs} } OPTIONAL,
 ...
@@ -2134,7 +2560,8 @@ ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-FreqBandIndicatorPriority			CRITICALITY ignore	EXTENSION FreqBandIndicatorPriority				PRESENCE optional}|
 	{ ID id-BandwidthReducedSI					CRITICALITY ignore	EXTENSION BandwidthReducedSI						PRESENCE optional}|
 	{ ID id-ProtectedEUTRAResourceIndication	CRITICALITY ignore	EXTENSION ProtectedEUTRAResourceIndication	PRESENCE optional}|
-	{ ID id-BPLMN-ID-Info-EUTRA					CRITICALITY ignore 	EXTENSION BPLMN-ID-Info-EUTRA						PRESENCE optional},
+	{ ID id-BPLMN-ID-Info-EUTRA					CRITICALITY ignore 	EXTENSION BPLMN-ID-Info-EUTRA						PRESENCE optional}|
+	{ ID id-NPRACHConfiguration					CRITICALITY ignore	EXTENSION	NPRACHConfiguration					PRESENCE optional},
 	...
 }
 
@@ -2186,6 +2613,11 @@ SGNB-Addition-Trigger-Ind	 ::= ENUMERATED {
 	...
 }
 
+SNtriggered ::=ENUMERATED{
+true,
+...
+}
+
 SourceOfUEActivityBehaviourInformation ::= ENUMERATED {
 	subscription-information,
 	statistics,
@@ -2258,6 +2690,53 @@ SRVCCOperationPossible ::= ENUMERATED {
 	...
 }
 
+SSBAreaCapacityValue-List	::=	SEQUENCE (SIZE (1.. maxnoofSSBAreas)) OF SSBAreaCapacityValue-Item
+
+SSBAreaCapacityValue-Item	::=		SEQUENCE {
+	ssbIndex							SSBIndex,
+	ssbAreaCapacityValue				INTEGER (0..100),
+	iE-Extensions						ProtocolExtensionContainer { {SSBAreaCapacityValue-ExtIEs} } OPTIONAL,
+	...
+}
+
+SSBAreaCapacityValue-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+SSBAreaRadioResourceStatus-List	::=	SEQUENCE (SIZE (1.. maxnoofSSBAreas)) OF SSBAreaRadioResourceStatus-Item
+
+SSBAreaRadioResourceStatus-Item	::= SEQUENCE {
+	ssbIndex							SSBIndex,
+	ssbAreaDLGBRPRBUsage				INTEGER (0..100),
+	ssbAreaULGBRPRBUsage				INTEGER (0..100),
+	ssbAreaDLNonGBRPRBUsage				INTEGER (0..100),
+	ssbAreaULNonGBRPRBUsage				INTEGER (0..100),
+	ssbAreaDLTotalPRBUsage				INTEGER (0..100),
+	ssbAreaULTotalPRBUsage				INTEGER (0..100),
+	ssbAreaDLSchedulingPDCCHCCEUsage	INTEGER (0..100)									OPTIONAL,
+	ssbAreaULSchedulingPDCCHCCEUsage	INTEGER (0..100)									OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { {SSBAreaRadioResourceStatus-ExtIEs} } OPTIONAL,
+	...
+}
+
+SSBAreaRadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+SSBIndex ::= INTEGER (0..63)
+
+SSB-PositionsInBurst ::= CHOICE {
+	shortBitmap						BIT STRING (SIZE (4)),
+	mediumBitmap					BIT STRING (SIZE (8)),
+	longBitmap						BIT STRING (SIZE (64)),
+	choice-extension				ProtocolIE-Single-Container { {SSB-PositionsInBurst-ExtIEs} }
+}
+
+SSB-PositionsInBurst-ExtIEs X2AP-PROTOCOL-IES ::= {
+	...
+}
+
+
 SubbandCQI-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
@@ -2345,6 +2824,8 @@ SupportedSULFreqBandItem-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 }
 
 SULInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-CarrierList						CRITICALITY ignore	EXTENSION NRCarrierList			PRESENCE optional }|
+	{ ID id-FrequencyShift7p5khz			CRITICALITY ignore	EXTENSION FrequencyShift7p5khz	PRESENCE optional },
 	...
 }
 
@@ -2411,6 +2892,8 @@ TAIBasedQMC-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 TAIListforQMC ::= SEQUENCE (SIZE(1..maxnoofTAforQMC)) OF TAI-Item
 
+TargetCellInNGRAN ::= OCTET STRING
+
 TargetCellInUTRAN ::= OCTET STRING -- This IE is to be encoded according to the UTRAN Cell ID in the Last Visited UTRAN Cell Information IE in TS 25.413 [24]
 
 TargeteNBtoSource-eNBTransparentContainer	::= OCTET STRING
@@ -2443,6 +2926,9 @@ TDD-InfoNeighbourServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+TDDULDLConfigurationCommonNR ::= OCTET STRING
+
+
 Threshold-RSRP ::= INTEGER(0..97)
 
 Threshold-RSRQ ::= INTEGER(0..34)
@@ -2461,6 +2947,124 @@ Time-UE-StayedInCell ::= INTEGER (0..4095)
 
 Time-UE-StayedInCell-EnhancedGranularity ::= INTEGER (0..40950)
 
+TNLA-To-Add-List ::= SEQUENCE (SIZE(1..maxnoofTNLAssociations)) OF TNLA-To-Add-Item
+
+TNLA-To-Add-Item ::= SEQUENCE {
+	tNLAssociationTransportLayerAddress		CPTransportLayerInformation,
+	tNLAssociationUsage						TNLAssociationUsage,
+	iE-Extensions							ProtocolExtensionContainer { { TNLA-To-Add-Item-ExtIEs} } OPTIONAL
+}
+
+TNLA-To-Add-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TNLA-To-Update-List ::= SEQUENCE (SIZE(1..maxnoofTNLAssociations)) OF TNLA-To-Update-Item
+
+TNLA-To-Update-Item::= SEQUENCE {
+	tNLAssociationTransportLayerAddress		CPTransportLayerInformation,
+	tNLAssociationUsage						TNLAssociationUsage 		OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { TNLA-To-Update-Item-ExtIEs} } OPTIONAL
+}
+
+TNLA-To-Update-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TNLA-To-Remove-List ::= SEQUENCE (SIZE(1..maxnoofTNLAssociations)) OF TNLA-To-Remove-Item
+
+TNLA-To-Remove-Item::= SEQUENCE {
+	tNLAssociationTransportLayerAddress		CPTransportLayerInformation,
+	iE-Extensions							ProtocolExtensionContainer { { TNLA-To-Remove-Item-ExtIEs} } OPTIONAL
+}
+
+TNLA-To-Remove-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TNLA-Setup-List ::= SEQUENCE (SIZE(1..maxnoofTNLAssociations)) OF TNLA-Setup-Item
+
+TNLA-Setup-Item ::= SEQUENCE {
+	tNLAssociationTransportLayerAddress		CPTransportLayerInformation,
+	iE-Extensions							ProtocolExtensionContainer { { TNLA-Setup-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+TNLA-Setup-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TNLA-Failed-To-Setup-List ::= SEQUENCE (SIZE(1..maxnoofTNLAssociations)) OF TNLA-Failed-To-Setup-Item
+
+TNLA-Failed-To-Setup-Item ::= SEQUENCE {
+	tNLAssociationTransportLayerAddress		CPTransportLayerInformation,
+	cause									Cause,
+	iE-Extensions							ProtocolExtensionContainer { { TNLA-Failed-To-Setup-Item-ExtIEs} } OPTIONAL
+}
+
+TNLA-Failed-To-Setup-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TNLAssociationUsage ::= ENUMERATED {
+	ue,
+	non-ue,
+	both,
+	...
+}
+
+TNLCapacityIndicator ::= SEQUENCE {
+	dlTNLMaximumOfferedCapacity			INTEGER (1..16777216, ...),
+	dlTNLAvailableCapacity				INTEGER (0..100, ...),
+	ulTNLMaximumOfferedCapacity			INTEGER (1..16777216, ...),
+	ulTNLAvailableCapacity				INTEGER (0..100, ...),
+	iE-Extensions						ProtocolExtensionContainer { {TNLCapacityIndicator-ExtIEs} } OPTIONAL,
+	...
+}
+
+TNLCapacityIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+Transport-UP-Layer-Addresses-Info-To-Add-List	::= SEQUENCE (SIZE(1.. maxnoofTLAs)) OF Transport-UP-Layer-Addresses-Info-To-Add-Item
+
+Transport-UP-Layer-Addresses-Info-To-Add-Item ::= SEQUENCE {
+	iP-SecTransportLayerAddress		TransportLayerAddress,
+	gTPTransportLayerAddressesToAdd			GTPTLAs							OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { Transport-UP-Layer-Addresses-Info-To-Add-ItemExtIEs } }    OPTIONAL,
+	...
+}
+
+Transport-UP-Layer-Addresses-Info-To-Add-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Transport-UP-Layer-Addresses-Info-To-Remove-List	::= SEQUENCE (SIZE(1.. maxnoofTLAs)) OF Transport-UP-Layer-Addresses-Info-To-Remove-Item
+
+Transport-UP-Layer-Addresses-Info-To-Remove-Item ::= SEQUENCE {
+	iP-SecTransportLayerAddress		TransportLayerAddress,
+	gTPTransportLayerAddressesToRemove			GTPTLAs							OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { Transport-UP-Layer-Addresses-Info-To-Remove-ItemExtIEs } }    OPTIONAL,
+	...
+}
+
+Transport-UP-Layer-Addresses-Info-To-Remove-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+TNLConfigurationInfo  ::= SEQUENCE {
+	transport-UP-Layer-Addresses-Info-To-Add-List		Transport-UP-Layer-Addresses-Info-To-Add-List						OPTIONAL,
+	transport-UP-Layer-Addresses-Info-To-Remove-List	Transport-UP-Layer-Addresses-Info-To-Remove-List					OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { { TNLConfigurationInfo-ExtIEs } }											OPTIONAL,
+	...
+}
+
+TNLConfigurationInfo-ExtIEs 	X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 TraceActivation ::= SEQUENCE {
 	eUTRANTraceID					EUTRANTraceID,
 	interfacesToTrace				InterfacesToTrace,
@@ -2472,7 +3076,9 @@ traceCollectionEntityIPAddress		TraceCollectionEntityIPAddress,
 
 TraceActivation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-MDTConfiguration			CRITICALITY ignore	EXTENSION MDT-Configuration			PRESENCE optional}|
-	{ ID id-UEAppLayerMeasConfig		CRITICALITY ignore	EXTENSION UEAppLayerMeasConfig		PRESENCE optional},
+	{ ID id-UEAppLayerMeasConfig		CRITICALITY ignore	EXTENSION UEAppLayerMeasConfig		PRESENCE optional}|
+-- WS modification: fix what seems to be an obvious typo (id-MDTConfiguration instead of id-MDTConfigurationNR)
+	{ ID id-MDTConfigurationNR			CRITICALITY ignore	EXTENSION MDT-ConfigurationNR		PRESENCE optional},
 	...
 }
 
@@ -2501,6 +3107,11 @@ Transmission-Bandwidth ::= ENUMERATED {
 
 TransportLayerAddress			::= BIT STRING (SIZE(1..160, ...))
 
+TransportLayerAddressAndPort		::= SEQUENCE {
+	endpointIPAddress				TransportLayerAddress,
+	portnumber						Port-Number
+}
+
 TunnelInformation ::= SEQUENCE {
 	transportLayerAddress	TransportLayerAddress,
 	uDP-Port-Number			Port-Number			OPTIONAL,
@@ -2564,6 +3175,8 @@ UE-X2AP-ID ::= INTEGER (0..4095)
 
 UE-X2AP-ID-Extension ::= INTEGER (0..4095, ...)
 
+UERadioCapabilityID ::= OCTET STRING
+
 UE-RLF-Report-Container::= OCTET STRING
 -- This IE is a transparent container and shall be encoded as the RLF-Report-r9 field contained in the UEInformationResponse message as defined in TS 36.331 [9]
 
@@ -2679,6 +3292,11 @@ UL-scheduling-PDCCH-CCE-usage::= INTEGER (0..100)
 
 UL-Total-PRB-usage::= INTEGER (0..100)
 
+UnlicensedSpectrumRestriction ::= ENUMERATED {
+	unlicensed-restricted,
+	...
+}
+
 UsableABSInformation ::= CHOICE {
 	fdd					UsableABSInformationFDD,
 	tdd					UsableABSInformationTDD,
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
index 9b5f18dcb7..7ec9e9c4aa 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V15.9.0 (2020-03)
+-- 3GPP TS 36.423 V16.2.0 (2020-07)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -38,6 +38,8 @@ IMPORTS
 	DeactivationIndication,
 	DL-Forwarding,
 	DynamicDLTransmissionInformation,
+	E-RABsSubjectToDLDiscarding-List,
+	E-RABsSubjectToEarlyStatusTransfer-List,
 	ECGI,
 	E-RAB-ID,
 	E-RAB-Level-QoS-Parameters,
@@ -52,6 +54,7 @@ IMPORTS
 	Masked-IMEISV,
 	InvokeIndication,
 	LocationReportingInformation,
+	LowerLayerPresenceStatusChange,
 	MDT-Configuration,
 	ManagementBasedMDTallowed,
 	MDTPLMNList,
@@ -180,7 +183,53 @@ IMPORTS
 	NRNeighbour-Information,
 	InterfaceInstanceIndication,
 	BPLMN-ID-Info-NR,
-	EPCHandoverRestrictionListContainer
+	SNtriggered,
+	EPCHandoverRestrictionListContainer,
+	AdditionalRRMPriorityIndex,
+	RequestedFastMCGRecoveryViaSRB3,
+	AvailableFastMCGRecoveryViaSRB3,
+	RequestedFastMCGRecoveryViaSRB3Release,
+	ReleaseFastMCGRecoveryViaSRB3,
+	FastMCGRecovery,
+	PartialListIndicator,
+	MaximumCellListSize,
+	MessageOversizeNotification,
+	TNLConfigurationInfo,
+	TNLA-To-Add-List,
+	TNLA-To-Update-List,
+	TNLA-To-Remove-List,
+	TNLA-Setup-List,
+	TNLA-Failed-To-Setup-List,
+	RAN-UE-NGAP-ID,
+	CHOinformation-REQ,
+	CHOinformation-ACK,
+	DAPSRequestInfo,
+	DAPSResponseInfo,
+	LowerLayerPresenceStatusChange,
+	CandidateCellsToBeCancelledList,
+	CHO-DC-Indicator,
+	Ethernet-Type,
+	NRV2XServicesAuthorized,
+	NRUESidelinkAggregateMaximumBitRate,
+	PC5QoSParameters,
+	TargetCellInNGRAN,
+	Measurement-ID-ENDC,
+	Registration-Request-ENDC,
+	ReportCharacteristics-ENDC,
+	NRRadioResourceStatus,
+	TNLCapacityIndicator,
+	NRCompositeAvailableCapacityGroup,
+	SSBIndex,
+	TDDULDLConfigurationCommonNR,
+	NRCarrierList,
+	SSB-PositionsInBurst,
+	NRCellPRACHConfig,
+	NBIoT-RLF-Report-Container,	PrivacyIndicator,
+	UERadioCapabilityID,
+	CSI-RSTransmissionIndication,
+	IABNodeIndication,
+	F1CTrafficContainer,
+	IABInformation
 
 
 FROM X2AP-IEs
@@ -205,9 +254,13 @@ FROM X2AP-Containers
 	id-CellInformation,
 	id-CellInformation-Item,
 	id-CellMeasurementResult,
+	id-CellMeasurementResult-ENDC,
 	id-CellMeasurementResult-Item,
+	id-CellMeasurementResult-ENDC-Item,
 	id-CellToReport,
+	id-CellToReport-ENDC,
 	id-CellToReport-Item,
+	id-CellToReport-ENDC-Item,
 	id-CompositeAvailableCapacityGroup,
 	id-AerialUEsubscriptionInformation,
 	id-CriticalityDiagnostics,
@@ -469,9 +522,58 @@ FROM X2AP-Containers
 	id-additionalPLMNs-Item,
 	id-InterfaceInstanceIndication,
 	id-BPLMN-ID-Info-NR,
-	id-ERABs-transferred-to-MeNB,
+	id-SNtriggered,
 	id-EPCHandoverRestrictionListContainer,
-
+	id-ERABs-transferred-to-MeNB,
+	id-AdditionalRRMPriorityIndex,
+	id-LowerLayerPresenceStatusChange,
+	id-FastMCGRecovery-SN-to-MN,
+	id-FastMCGRecovery-MN-to-SN,
+	id-RequestedFastMCGRecoveryViaSRB3,
+	id-AvailableFastMCGRecoveryViaSRB3,
+	id-RequestedFastMCGRecoveryViaSRB3Release,
+	id-ReleaseFastMCGRecoveryViaSRB3,
+	id-PartialListIndicator,
+	id-MaximumCellListSize,
+	id-MessageOversizeNotification,
+	id-CellandCapacityAssistInfo,
+	id-TNLConfigurationInfo,
+	id-TNLA-To-Add-List,
+	id-TNLA-To-Update-List,
+	id-TNLA-To-Remove-List,
+	id-TNLA-Setup-List,
+	id-TNLA-Failed-To-Setup-List,
+	id-UEContextReferenceatSourceNGRAN,
+	id-CHOinformation-REQ,
+	id-CHOinformation-ACK,
+	id-DAPSRequestInfo,
+	id-RequestedTargetCellID,
+	id-CandidateCellsToBeCancelledList,
+	id-DAPSResponseInfo,
+	id-ProcedureStage,
+	id-CHO-DC-Indicator,
+	id-Ethernet-Type,
+	id-NRV2XServicesAuthorized,
+	id-NRUESidelinkAggregateMaximumBitRate,
+	id-PC5QoSParameters,
+	id-TargetCellInNGRAN,
+	id-eNB-Measurement-ID-ENDC,
+	id-engNB-Measurement-ID-ENDC,
+	id-TDDULDLConfigurationCommonNR,
+	id-CarrierList,
+	id-ULCarrierList,
+	id-SSB-PositionsInBurst,
+	id-NRCellPRACHConfig,
+	id-NBIoT-RLF-Report-Container,
+	id-MDTConfigurationNR,
+	id-PrivacyIndicator,
+	id-TraceCollectionEntityIPAddress,
+	id-UERadioCapabilityID,
+	id-CSI-RSTransmissionIndication,
+	id-DLCarrierList,
+	id-IABNodeIndication,
+	id-F1CTrafficContainer,
+	id-IABInformation,
 	maxCellineNB,
 	maxnoofBearers,
 	maxnoofPDCP-SN,
@@ -484,7 +586,8 @@ FROM X2AP-Containers
 	maxnoofPLMNforQMC,
 	maxnoofProtectedResourcePatterns,
 	maxnoNRcellsSpectrumSharingWithE-UTRA,
-	maxnoofNrCellBands
+	maxnoofNrCellBands,
+	maxnoofSSBAreas
 
 FROM X2AP-Constants;
 
@@ -521,7 +624,11 @@ HandoverRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-NRUESecurityCapabilities						CRITICALITY ignore	TYPE NRUESecurityCapabilities							PRESENCE optional}|
 	{ ID id-UE-ContextReferenceAtSgNB					CRITICALITY ignore	TYPE UE-ContextReferenceAtSgNB							PRESENCE optional}|
 	{ ID id-AerialUEsubscriptionInformation				CRITICALITY ignore	TYPE AerialUEsubscriptionInformation					PRESENCE optional}|
-	{ ID id-Subscription-Based-UE-DifferentiationInfo	CRITICALITY ignore	TYPE Subscription-Based-UE-DifferentiationInfo	PRESENCE optional},
+	{ ID id-Subscription-Based-UE-DifferentiationInfo	CRITICALITY ignore	TYPE Subscription-Based-UE-DifferentiationInfo	PRESENCE optional}|
+	{ ID id-CHOinformation-REQ							CRITICALITY ignore	TYPE CHOinformation-REQ									PRESENCE optional}|
+	{ ID id-NRV2XServicesAuthorized						CRITICALITY ignore	TYPE NRV2XServicesAuthorized							PRESENCE optional}|
+	{ ID id-PC5QoSParameters							CRITICALITY ignore	TYPE PC5QoSParameters										PRESENCE optional }|
+	{ ID id-IABNodeIndication							CRITICALITY reject	TYPE IABNodeIndication									PRESENCE optional},
 	...
 }
 
@@ -543,7 +650,10 @@ UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 { ID id-ManagementBasedMDTallowed			CRITICALITY ignore	EXTENSION ManagementBasedMDTallowed					PRESENCE optional }|
 { ID id-ManagementBasedMDTPLMNList			CRITICALITY ignore	EXTENSION MDTPLMNList									PRESENCE optional }|
 { ID id-UESidelinkAggregateMaximumBitRate	CRITICALITY ignore	EXTENSION UESidelinkAggregateMaximumBitRate		PRESENCE optional }|
-{ ID id-EPCHandoverRestrictionListContainer CRITICALITY ignore	EXTENSION EPCHandoverRestrictionListContainer		PRESENCE optional },
+{ ID id-EPCHandoverRestrictionListContainer CRITICALITY ignore	EXTENSION EPCHandoverRestrictionListContainer		PRESENCE optional }|
+{ ID id-AdditionalRRMPriorityIndex			CRITICALITY ignore	EXTENSION AdditionalRRMPriorityIndex					PRESENCE optional}|
+{ ID id-NRUESidelinkAggregateMaximumBitRate	CRITICALITY ignore	EXTENSION NRUESidelinkAggregateMaximumBitRate		PRESENCE optional}|
+{ ID id-UERadioCapabilityID					CRITICALITY reject	EXTENSION UERadioCapabilityID							PRESENCE optional },
 	...
 }
 
@@ -564,7 +674,9 @@ E-RABs-ToBeSetup-Item ::= SEQUENCE {
 }
 
 E-RABs-ToBeSetup-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-	{ ID id-BearerType		CRITICALITY reject	EXTENSION BearerType		PRESENCE optional},
+	{ ID id-BearerType		CRITICALITY reject	EXTENSION BearerType		PRESENCE optional}|
+	{ ID id-DAPSRequestInfo		CRITICALITY ignore	EXTENSION DAPSRequestInfo			PRESENCE optional}|
+	{ ID id-Ethernet-Type	CRITICALITY ignore	EXTENSION Ethernet-Type		PRESENCE optional},
 	...
 }
 
@@ -623,11 +735,12 @@ HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-TargeteNBtoSource-eNBTransparentContainer	CRITICALITY ignore	TYPE TargeteNBtoSource-eNBTransparentContainer	PRESENCE mandatory}|
 	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional}|
 	{ ID id-UE-ContextKeptIndicator						CRITICALITY ignore	TYPE UE-ContextKeptIndicator	PRESENCE optional}|
-	{ ID id-SeNB-UE-X2AP-ID-Extension					CRITICALITY ignore	TYPE UE-X2AP-ID-Extension	PRESENCE optional}-- The id-SeNB-UE-X2AP-ID-Extension shall not be sent shall not be sent and shall be ignored, if received.--|
+	{ ID id-SeNB-UE-X2AP-ID-Extension					CRITICALITY ignore	TYPE UE-X2AP-ID-Extension	PRESENCE optional}-- The id-SeNB-UE-X2AP-ID-Extension shall not be sent and shall be ignored, if received.--|
 	{ ID id-Old-eNB-UE-X2AP-ID-Extension				CRITICALITY ignore	TYPE UE-X2AP-ID-Extension	PRESENCE optional}|
 	{ ID id-New-eNB-UE-X2AP-ID-Extension				CRITICALITY reject	TYPE UE-X2AP-ID-Extension	PRESENCE optional}|
 	{ ID id-WT-UE-ContextKeptIndicator					CRITICALITY ignore	TYPE UE-ContextKeptIndicator	PRESENCE optional}|
-	{ ID id-ERABs-transferred-to-MeNB					CRITICALITY ignore	TYPE E-RAB-List			PRESENCE optional},
+	{ ID id-ERABs-transferred-to-MeNB					CRITICALITY ignore	TYPE E-RAB-List			PRESENCE optional}|
+	{ ID id-CHOinformation-ACK							CRITICALITY ignore	TYPE CHOinformation-ACK									PRESENCE optional},
 	...
 }
 
@@ -646,6 +759,7 @@ E-RABs-Admitted-Item ::= SEQUENCE {
 }
 
 E-RABs-Admitted-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-DAPSResponseInfo				CRITICALITY reject	EXTENSION DAPSResponseInfo			PRESENCE optional},
 	...
 }
 
@@ -664,8 +778,8 @@ HandoverPreparationFailure-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Old-eNB-UE-X2AP-ID				CRITICALITY ignore	TYPE UE-X2AP-ID					PRESENCE mandatory}|
 	{ ID id-Cause							CRITICALITY ignore	TYPE Cause						PRESENCE mandatory}|
 	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional}|
-	{ ID id-Old-eNB-UE-X2AP-ID-Extension	CRITICALITY ignore	TYPE UE-X2AP-ID-Extension		PRESENCE optional},
-
+	{ ID id-Old-eNB-UE-X2AP-ID-Extension	CRITICALITY ignore	TYPE UE-X2AP-ID-Extension		PRESENCE optional}|
+	{ ID id-RequestedTargetCellID			CRITICALITY reject	TYPE ECGI						PRESENCE optional},
 	...
 }
 
@@ -690,10 +804,60 @@ HandoverReport-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-SourceCellCRNTI								CRITICALITY ignore	TYPE CRNTI													PRESENCE optional}|
 	{ ID id-MobilityInformation							CRITICALITY ignore	TYPE MobilityInformation									PRESENCE optional}|
 	{ ID id-UE-RLF-Report-Container						CRITICALITY ignore	TYPE UE-RLF-Report-Container							PRESENCE optional}|
-	{ ID id-UE-RLF-Report-Container-for-extended-bands	CRITICALITY ignore	TYPE UE-RLF-Report-Container-for-extended-bands	PRESENCE optional},
+	{ ID id-UE-RLF-Report-Container-for-extended-bands	CRITICALITY ignore	TYPE UE-RLF-Report-Container-for-extended-bands	PRESENCE optional}|
+	{ ID id-TargetCellInNGRAN							CRITICALITY ignore	TYPE TargetCellInNGRAN									PRESENCE conditional} -- The IE shall be present if the Handover Report Type IE is set to "interSystemPingpong" --,
+	...
+}
+
+-- **************************************************************
+--
+-- EARLY STATUS TRANSFER
+--
+-- **************************************************************
+
+EarlyStatusTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container	{{ EarlyStatusTransfer-IEs}},
+	...
+}
+
+EarlyStatusTransfer-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Old-eNB-UE-X2AP-ID					CRITICALITY reject		TYPE UE-X2AP-ID									PRESENCE mandatory}|
+	{ ID id-New-eNB-UE-X2AP-ID					CRITICALITY reject		TYPE UE-X2AP-ID									PRESENCE mandatory}|
+	{ ID id-Old-eNB-UE-X2AP-ID-Extension		CRITICALITY reject		TYPE UE-X2AP-ID-Extension						PRESENCE optional}|
+	{ ID id-New-eNB-UE-X2AP-ID-Extension		CRITICALITY reject		TYPE UE-X2AP-ID-Extension						PRESENCE optional}|
+	{ ID id-ProcedureStage						CRITICALITY reject		TYPE ProcedureStageChoice						PRESENCE mandatory},
+	...
+}
+
+ProcedureStageChoice ::= CHOICE {
+	first-dl-count						FirstDLCount,
+	dl-discarding						DLDiscarding,
+	choice-extension					ProtocolIE-Single-Container { {ProcedureStageChoice-ExtIEs} }
+}
+
+ProcedureStageChoice-ExtIEs X2AP-PROTOCOL-IES ::= {
+	...
+}
+
+FirstDLCount ::= SEQUENCE {
+	e-RABsSubjectToEarlyStatusTransfer		E-RABsSubjectToEarlyStatusTransfer-List,
+	iE-Extension								ProtocolExtensionContainer { {FirstDLCount-ExtIEs} }	OPTIONAL,
+	...
+}
+
+FirstDLCount-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+DLDiscarding ::= SEQUENCE {
+	e-RABsSubjectToDLDiscarding-List			E-RABsSubjectToDLDiscarding-List,
+	iE-Extension								ProtocolExtensionContainer { {DLDiscarding-ExtIEs} }	OPTIONAL,
+	...
+}
+
+DLDiscarding-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 -- **************************************************************
 --
 -- SN STATUS TRANSFER
@@ -783,6 +947,48 @@ HandoverCancel-IEs X2AP-PROTOCOL-IES ::= {
 	...
 }
 
+
+-- **************************************************************
+--
+-- HANDOVER SUCCESS
+--
+-- **************************************************************
+
+HandoverSuccess ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container	{{HandoverSuccess-IEs}},
+	...
+}
+
+HandoverSuccess-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Old-eNB-UE-X2AP-ID					CRITICALITY reject TYPE UE-X2AP-ID					PRESENCE mandatory}|
+	{ ID id-New-eNB-UE-X2AP-ID					CRITICALITY	reject TYPE UE-X2AP-ID					PRESENCE mandatory}|
+	{ ID id-Old-eNB-UE-X2AP-ID-Extension		CRITICALITY ignore	TYPE UE-X2AP-ID-Extension		PRESENCE optional}|
+	{ ID id-New-eNB-UE-X2AP-ID-Extension		CRITICALITY ignore	TYPE UE-X2AP-ID-Extension		PRESENCE optional}|
+	{ ID id-TargetCell-ID						CRITICALITY reject	TYPE ECGI						PRESENCE mandatory},
+	...
+}
+
+-- **************************************************************
+--
+-- CONDITIONAL HANDOVER CANCEL
+--
+-- **************************************************************
+
+ConditionalHandoverCancel ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container	{{ConditionalHandoverCancel-IEs}},
+	...
+}
+
+ConditionalHandoverCancel-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-Old-eNB-UE-X2AP-ID					CRITICALITY reject	TYPE UE-X2AP-ID					PRESENCE mandatory}|
+	{ ID id-New-eNB-UE-X2AP-ID					CRITICALITY ignore	TYPE UE-X2AP-ID					PRESENCE optional}|
+	{ ID id-Cause								CRITICALITY ignore	TYPE Cause						PRESENCE mandatory}|
+	{ ID id-Old-eNB-UE-X2AP-ID-Extension		CRITICALITY reject	TYPE UE-X2AP-ID-Extension		PRESENCE optional}|
+	{ ID id-New-eNB-UE-X2AP-ID-Extension		CRITICALITY ignore	TYPE UE-X2AP-ID-Extension		PRESENCE optional}|
+	{ ID id-CandidateCellsToBeCancelledList		CRITICALITY reject	TYPE CandidateCellsToBeCancelledList			PRESENCE optional},
+	...
+}
+
 -- **************************************************************
 --
 -- ERROR INDICATION
@@ -1303,7 +1509,8 @@ RLFIndication-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-UE-RLF-Report-Container						CRITICALITY ignore	TYPE UE-RLF-Report-Container								PRESENCE optional}|
 	{ ID id-RRCConnSetupIndicator						CRITICALITY reject	TYPE RRCConnSetupIndicator									PRESENCE optional}|
 	{ ID id-RRCConnReestabIndicator						CRITICALITY ignore	TYPE RRCConnReestabIndicator								PRESENCE optional}|
-	{ ID id-UE-RLF-Report-Container-for-extended-bands	CRITICALITY ignore	TYPE UE-RLF-Report-Container-for-extended-bands		PRESENCE optional},
+	{ ID id-UE-RLF-Report-Container-for-extended-bands	CRITICALITY ignore	TYPE UE-RLF-Report-Container-for-extended-bands		PRESENCE optional}|
+	{ ID id-NBIoT-RLF-Report-Container					CRITICALITY ignore	TYPE NBIoT-RLF-Report-Container							PRESENCE optional},
 	...
 }
 
@@ -1482,7 +1689,8 @@ E-RABs-ToBeAdded-Item-SCG-Bearer ::= SEQUENCE {
 E-RABs-ToBeAdded-Item-SCG-BearerExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Correlation-ID				CRITICALITY ignore	EXTENSION Correlation-ID		PRESENCE optional}|
 	{ ID id-SIPTO-Correlation-ID		CRITICALITY ignore	EXTENSION Correlation-ID		PRESENCE optional}|
-	{ ID id-BearerType					CRITICALITY ignore	EXTENSION BearerType			PRESENCE optional},
+	{ ID id-BearerType					CRITICALITY ignore	EXTENSION BearerType			PRESENCE optional}|
+	{ ID id-Ethernet-Type				CRITICALITY ignore	EXTENSION Ethernet-Type			PRESENCE optional},
 	...
 }
 
@@ -1693,7 +1901,8 @@ E-RABs-ToBeAdded-ModReqItem-SCG-Bearer ::= SEQUENCE {
 E-RABs-ToBeAdded-ModReqItem-SCG-BearerExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Correlation-ID				CRITICALITY ignore	EXTENSION Correlation-ID		PRESENCE optional}|
 	{ ID id-SIPTO-Correlation-ID		CRITICALITY ignore	EXTENSION Correlation-ID		PRESENCE optional}|
-	{ ID id-BearerType					CRITICALITY ignore	EXTENSION BearerType			PRESENCE optional},
+	{ ID id-BearerType					CRITICALITY ignore	EXTENSION BearerType			PRESENCE optional}|
+	{ ID id-Ethernet-Type				CRITICALITY ignore	EXTENSION Ethernet-Type			PRESENCE optional},
 	...
 }
 
@@ -2257,6 +2466,9 @@ RetrieveUEContextRequest ::= SEQUENCE {
 RetrieveUEContextRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-New-eNB-UE-X2AP-ID					CRITICALITY reject	TYPE UE-X2AP-ID				PRESENCE mandatory}|
 	{ ID id-SeNB-UE-X2AP-ID-Extension			CRITICALITY reject	TYPE UE-X2AP-ID-Extension	PRESENCE optional}|
+-- Allocated at the new eNB.
+-- This IE contains an Extended eNB UE X2AP ID, which, together with the New eNB UE X2AP ID IE
+-- represents the eNB UE X2AP ID allocated at the new eNB.
 	{ ID id-resumeID							CRITICALITY reject	TYPE ResumeID				PRESENCE mandatory}|
 	{ ID id-ShortMAC-I							CRITICALITY reject	TYPE ShortMAC-I				PRESENCE mandatory}|
 	{ ID id-NewEUTRANCellIdentifier				CRITICALITY reject	TYPE EUTRANCellIdentifier	PRESENCE mandatory}|
@@ -2291,7 +2503,9 @@ RetrieveUEContextResponse-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics								PRESENCE optional}|
 	{ ID id-V2XServicesAuthorized						CRITICALITY ignore	TYPE V2XServicesAuthorized								PRESENCE optional}|
 	{ ID id-AerialUEsubscriptionInformation				CRITICALITY ignore	TYPE AerialUEsubscriptionInformation					PRESENCE optional}|
-	{ ID id-Subscription-Based-UE-DifferentiationInfo	CRITICALITY ignore	TYPE Subscription-Based-UE-DifferentiationInfo	PRESENCE optional},
+	{ ID id-Subscription-Based-UE-DifferentiationInfo	CRITICALITY ignore	TYPE Subscription-Based-UE-DifferentiationInfo	PRESENCE optional}|
+	{ ID id-NRV2XServicesAuthorized						CRITICALITY ignore	TYPE NRV2XServicesAuthorized							PRESENCE optional}|
+	{ ID id-PC5QoSParameters							CRITICALITY ignore	TYPE PC5QoSParameters										PRESENCE optional },
 	...
 }
 
@@ -2313,7 +2527,10 @@ UE-ContextInformationRetrieve ::= SEQUENCE {
 
 UE-ContextInformationRetrieve-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 { ID id-UESidelinkAggregateMaximumBitRate	CRITICALITY ignore	EXTENSION UESidelinkAggregateMaximumBitRate		PRESENCE optional }|
-{ ID id-EPCHandoverRestrictionListContainer CRITICALITY ignore	EXTENSION EPCHandoverRestrictionListContainer		PRESENCE optional },
+{ ID id-AdditionalRRMPriorityIndex			CRITICALITY ignore	EXTENSION AdditionalRRMPriorityIndex					PRESENCE optional }|
+{ ID id-EPCHandoverRestrictionListContainer CRITICALITY ignore	EXTENSION EPCHandoverRestrictionListContainer		PRESENCE optional }|
+{ ID id-NRUESidelinkAggregateMaximumBitRate	CRITICALITY ignore	EXTENSION NRUESidelinkAggregateMaximumBitRate		PRESENCE optional}|
+{ ID id-UERadioCapabilityID					CRITICALITY reject	EXTENSION UERadioCapabilityID							PRESENCE optional },
 	...
 }
 
@@ -2334,7 +2551,8 @@ E-RABs-ToBeSetupRetrieve-Item ::= SEQUENCE {
 
 E-RABs-ToBeSetupRetrieve-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-uL-GTPtunnelEndpoint		CRITICALITY reject	EXTENSION GTPtunnelEndpoint		PRESENCE mandatory}|
-	{ ID id-dL-Forwarding				CRITICALITY ignore	EXTENSION DL-Forwarding			PRESENCE optional },
+	{ ID id-dL-Forwarding				CRITICALITY ignore	EXTENSION DL-Forwarding			PRESENCE optional}|
+	{ ID id-Ethernet-Type				CRITICALITY ignore	EXTENSION Ethernet-Type			PRESENCE optional},
 	...
 }
 
@@ -2388,8 +2606,14 @@ SgNBAdditionRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-DesiredActNotificationLevel				CRITICALITY ignore	TYPE DesiredActNotificationLevel				PRESENCE optional}|
 	{ ID id-TraceActivation							CRITICALITY ignore	TYPE TraceActivation								PRESENCE optional}|
 	{ ID id-LocationInformationSgNBReporting			CRITICALITY ignore	TYPE LocationInformationSgNBReporting			PRESENCE optional}|
-	{ ID id-Masked-IMEISV							CRITICALITY ignore	TYPE Masked-IMEISV									PRESENCE optional},
-	...
+	{ ID id-Masked-IMEISV							CRITICALITY ignore	TYPE Masked-IMEISV									PRESENCE optional}|
+	{ ID id-AdditionalRRMPriorityIndex				CRITICALITY ignore	TYPE AdditionalRRMPriorityIndex					PRESENCE optional}|
+	{ ID id-RequestedFastMCGRecoveryViaSRB3			CRITICALITY ignore	TYPE	 RequestedFastMCGRecoveryViaSRB3			PRESENCE optional}|
+	{ ID id-UEContextReferenceatSourceNGRAN			CRITICALITY ignore	TYPE RAN-UE-NGAP-ID									PRESENCE optional}|
+	{ ID id-ManagementBasedMDTallowed				CRITICALITY ignore	TYPE ManagementBasedMDTallowed					PRESENCE optional }|
+	{ ID id-ManagementBasedMDTPLMNList				CRITICALITY ignore	TYPE MDTPLMNList									PRESENCE optional }|
+	{ ID id-UERadioCapabilityID						CRITICALITY reject	TYPE UERadioCapabilityID							PRESENCE optional}|
+	{ ID id-IABNodeIndication						CRITICALITY reject	TYPE IABNodeIndication								PRESENCE optional},	...
 }
 
 E-RABs-ToBeAdded-SgNBAddReqList ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RABs-ToBeAdded-SgNBAddReq-ItemIEs} }
@@ -2430,7 +2654,8 @@ E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresent ::= SEQUENCE {
 
 E-RABs-ToBeAdded-SgNBAddReq-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-RLCMode-transferred					CRITICALITY ignore	EXTENSION RLCMode					PRESENCE optional}|
-	{ ID id-BearerType							CRITICALITY ignore	EXTENSION BearerType				PRESENCE optional},
+	{ ID id-BearerType							CRITICALITY ignore	EXTENSION BearerType				PRESENCE optional}|
+	{ ID id-Ethernet-Type						CRITICALITY ignore	EXTENSION Ethernet-Type				PRESENCE optional},
 	...
 }
 
@@ -2474,7 +2699,8 @@ SgNBAdditionRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-AdmittedSplitSRBs							CRITICALITY reject	TYPE SplitSRBs													PRESENCE optional}|
 	{ ID id-SgNBResourceCoordinationInformation			CRITICALITY ignore	TYPE SgNBResourceCoordinationInformation				PRESENCE optional}|
 	{ ID id-RRCConfigIndication							CRITICALITY reject	TYPE RRC-Config-Ind												PRESENCE optional}|
-	{ ID id-LocationInformationSgNB						CRITICALITY ignore	TYPE LocationInformationSgNB								PRESENCE optional},
+	{ ID id-LocationInformationSgNB						CRITICALITY ignore	TYPE LocationInformationSgNB								PRESENCE optional}|
+	{ ID id-AvailableFastMCGRecoveryViaSRB3				CRITICALITY ignore	TYPE AvailableFastMCGRecoveryViaSRB3						PRESENCE optional },
 	...
 }
 
@@ -2615,21 +2841,25 @@ SgNBModificationRequest ::= SEQUENCE {
 }
 
 SgNBModificationRequest-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-MeNB-UE-X2AP-ID						CRITICALITY reject	TYPE UE-X2AP-ID									PRESENCE mandatory}|
-	{ ID id-SgNB-UE-X2AP-ID						CRITICALITY reject	TYPE SgNB-UE-X2AP-ID							PRESENCE mandatory}|
-	{ ID id-Cause								CRITICALITY ignore	TYPE Cause										PRESENCE mandatory}|
-	{ ID id-SelectedPLMN						CRITICALITY ignore	TYPE PLMN-Identity								PRESENCE optional}|
-	{ ID id-HandoverRestrictionList				CRITICALITY ignore	TYPE HandoverRestrictionList					PRESENCE optional}|
-	{ ID	id-SCGConfigurationQuery			CRITICALITY ignore	TYPE SCGConfigurationQuery						PRESENCE optional}|
-	{ ID id-UE-ContextInformation-SgNBModReq	CRITICALITY reject	TYPE UE-ContextInformation-SgNBModReq		PRESENCE optional}|
-	{ ID id-MeNBtoSgNBContainer					CRITICALITY reject	TYPE MeNBtoSgNBContainer						PRESENCE optional}|
-	{ ID id-MeNB-UE-X2AP-ID-Extension			CRITICALITY reject	TYPE UE-X2AP-ID-Extension						PRESENCE optional}|
-	{ ID id-MeNBResourceCoordinationInformation	CRITICALITY ignore	TYPE MeNBResourceCoordinationInformation	PRESENCE optional}|
-	{ ID id-RequestedSplitSRBs					CRITICALITY ignore	TYPE SplitSRBs									PRESENCE optional}|
-	{ ID id-RequestedSplitSRBsrelease			CRITICALITY ignore	TYPE SplitSRBs									PRESENCE optional}|
-	{ ID id-DesiredActNotificationLevel			CRITICALITY ignore	TYPE DesiredActNotificationLevel				PRESENCE optional}|
-	{ ID id-LocationInformationSgNBReporting	CRITICALITY ignore	TYPE LocationInformationSgNBReporting		PRESENCE optional}|
-	{ ID id-MeNBCell-ID							CRITICALITY ignore	TYPE ECGI										PRESENCE optional},
+	{ ID id-MeNB-UE-X2AP-ID							CRITICALITY reject	TYPE UE-X2AP-ID											PRESENCE mandatory}|
+	{ ID id-SgNB-UE-X2AP-ID							CRITICALITY reject	TYPE SgNB-UE-X2AP-ID									PRESENCE mandatory}|
+	{ ID id-Cause									CRITICALITY ignore	TYPE Cause												PRESENCE mandatory}|
+	{ ID id-SelectedPLMN							CRITICALITY ignore	TYPE PLMN-Identity										PRESENCE optional}|
+	{ ID id-HandoverRestrictionList					CRITICALITY ignore	TYPE HandoverRestrictionList							PRESENCE optional}|
+	{ ID	id-SCGConfigurationQuery				CRITICALITY ignore	TYPE SCGConfigurationQuery							PRESENCE optional}|
+	{ ID id-UE-ContextInformation-SgNBModReq		CRITICALITY reject	TYPE UE-ContextInformation-SgNBModReq				PRESENCE optional}|
+	{ ID id-MeNBtoSgNBContainer						CRITICALITY reject	TYPE MeNBtoSgNBContainer								PRESENCE optional}|
+	{ ID id-MeNB-UE-X2AP-ID-Extension				CRITICALITY reject	TYPE UE-X2AP-ID-Extension								PRESENCE optional}|
+	{ ID id-MeNBResourceCoordinationInformation		CRITICALITY ignore	TYPE MeNBResourceCoordinationInformation			PRESENCE optional}|
+	{ ID id-RequestedSplitSRBs						CRITICALITY ignore	TYPE SplitSRBs											PRESENCE optional}|
+	{ ID id-RequestedSplitSRBsrelease				CRITICALITY ignore	TYPE SplitSRBs											PRESENCE optional}|
+	{ ID id-DesiredActNotificationLevel				CRITICALITY ignore	TYPE DesiredActNotificationLevel					PRESENCE optional}|
+	{ ID id-LocationInformationSgNBReporting		CRITICALITY ignore	TYPE LocationInformationSgNBReporting				PRESENCE optional}|
+	{ ID id-MeNBCell-ID								CRITICALITY ignore	TYPE ECGI												PRESENCE optional}|
+	{ ID id-RequestedFastMCGRecoveryViaSRB3			CRITICALITY ignore	TYPE RequestedFastMCGRecoveryViaSRB3				PRESENCE optional}|
+	{ ID id-RequestedFastMCGRecoveryViaSRB3Release	CRITICALITY ignore	TYPE RequestedFastMCGRecoveryViaSRB3Release		PRESENCE optional}|
+	{ ID id-SNtriggered								CRITICALITY ignore	TYPE SNtriggered										PRESENCE optional}|
+	{ ID id-IABNodeIndication						CRITICALITY	reject	TYPE IABNodeIndication									PRESENCE optional},
 	...
 }
 
@@ -2645,7 +2875,9 @@ UE-ContextInformation-SgNBModReq ::= SEQUENCE {
 }
 
 UE-ContextInformationSgNBModReqExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-	{	ID id-SubscriberProfileIDforRFP					CRITICALITY ignore	EXTENSION SubscriberProfileIDforRFP									PRESENCE optional},
+	{	ID id-SubscriberProfileIDforRFP					CRITICALITY ignore	EXTENSION SubscriberProfileIDforRFP									PRESENCE optional}|
+	{ ID id-AdditionalRRMPriorityIndex				CRITICALITY ignore	EXTENSION AdditionalRRMPriorityIndex					PRESENCE optional}|
+	{ID id-LowerLayerPresenceStatusChange			CRITICALITY ignore	EXTENSION LowerLayerPresenceStatusChange				PRESENCE optional},
 	...
 }
 
@@ -2687,7 +2919,8 @@ E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresent ::= SEQUENCE {
 
 E-RABs-ToBeAdded-SgNBModReq-Item-SgNBPDCPpresentExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ ID id-RLCMode-transferred					CRITICALITY ignore	EXTENSION RLCMode					PRESENCE optional}|
-	{ ID id-BearerType							CRITICALITY ignore	EXTENSION BearerType				PRESENCE optional},
+	{ ID id-BearerType							CRITICALITY ignore	EXTENSION BearerType				PRESENCE optional}|
+	{ ID id-Ethernet-Type						CRITICALITY ignore	EXTENSION Ethernet-Type				PRESENCE optional},
 	...
 }
 
@@ -2833,7 +3066,9 @@ SgNBModificationRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-AdmittedSplitSRBs							CRITICALITY ignore	TYPE SplitSRBs													PRESENCE optional}|
 	{ ID id-AdmittedSplitSRBsrelease						CRITICALITY ignore	TYPE SplitSRBs													PRESENCE optional}|
 	{ ID id-RRCConfigIndication							CRITICALITY reject	TYPE RRC-Config-Ind												PRESENCE optional}|
-	{ ID id-LocationInformationSgNB						CRITICALITY ignore	TYPE LocationInformationSgNB								PRESENCE optional},
+	{ ID id-LocationInformationSgNB						CRITICALITY ignore	TYPE LocationInformationSgNB								PRESENCE optional}|
+	{ ID id-AvailableFastMCGRecoveryViaSRB3				CRITICALITY ignore	TYPE AvailableFastMCGRecoveryViaSRB3						PRESENCE optional}|
+	{ ID id-ReleaseFastMCGRecoveryViaSRB3		CRITICALITY ignore	TYPE ReleaseFastMCGRecoveryViaSRB3				PRESENCE optional},
 	...
 }
 
@@ -3334,7 +3569,7 @@ SgNBReleaseRequired-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Cause									CRITICALITY ignore	TYPE Cause												PRESENCE mandatory}|
 	{ ID id-MeNB-UE-X2AP-ID-Extension				CRITICALITY reject	TYPE UE-X2AP-ID-Extension								PRESENCE optional }|
 	{ ID id-E-RABs-ToBeReleased-SgNBRelReqdList		CRITICALITY ignore	TYPE E-RABs-ToBeReleased-SgNBRelReqdList			PRESENCE optional }|
-	{ ID id-SgNBtoMeNBContainer						CRITICALITY ignore	TYPE SgNBtoMeNBContainer								PRESENCE optional },
+	{ ID id-SgNBtoMeNBContainer						CRITICALITY ignore	TYPE SgNBtoMeNBContainer									PRESENCE optional },
 	...
 }
 
@@ -3557,7 +3792,10 @@ RRCTransfer-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-SgNB-UE-X2AP-ID						CRITICALITY reject	TYPE SgNB-UE-X2AP-ID				PRESENCE mandatory}|
 	{ ID id-SplitSRB								CRITICALITY reject	TYPE SplitSRB					PRESENCE optional}|
 	{ ID id-NRUeReport							CRITICALITY reject	TYPE NRUeReport					PRESENCE optional}|
-	{ ID id-MeNB-UE-X2AP-ID-Extension			CRITICALITY reject	TYPE UE-X2AP-ID-Extension		PRESENCE optional},
+	{ ID id-MeNB-UE-X2AP-ID-Extension			CRITICALITY reject	TYPE UE-X2AP-ID-Extension		PRESENCE optional}|
+	{ ID id-FastMCGRecovery-SN-to-MN				CRITICALITY ignore 	TYPE FastMCGRecovery				PRESENCE optional}|
+	{ ID id-FastMCGRecovery-MN-to-SN				CRITICALITY ignore 	TYPE FastMCGRecovery				PRESENCE optional}|
+	{ ID id-IABInformation						CRITICALITY ignore  TYPE IABInformation				PRESENCE optional},
 	...
 }
 
@@ -3594,7 +3832,8 @@ ENDCX2SetupRequest ::= SEQUENCE {
 
 ENDCX2SetupRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-InitiatingNodeType-EndcX2Setup			CRITICALITY reject	TYPE InitiatingNodeType-EndcX2Setup		PRESENCE mandatory}|
-	{ ID id-InterfaceInstanceIndication				CRITICALITY reject 	TYPE InterfaceInstanceIndication			PRESENCE optional},
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject 	TYPE InterfaceInstanceIndication			PRESENCE optional}|
+	{ ID id-TNLConfigurationInfo					CRITICALITY ignore	TYPE TNLConfigurationInfo						PRESENCE optional},
 	...
 }
 
@@ -3607,8 +3846,9 @@ InitiatingNodeType-EndcX2Setup ::= CHOICE {
 ENB-ENDCX2SetupReqIEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-GlobalENB-ID								CRITICALITY reject	TYPE GlobalENB-ID										PRESENCE mandatory}|
 	{ ID id-ServedEUTRAcellsENDCX2ManagementList		CRITICALITY reject	TYPE ServedEUTRAcellsENDCX2ManagementList		PRESENCE mandatory}|
-	{ ID id-InterfaceInstanceIndication				CRITICALITY reject 	TYPE InterfaceInstanceIndication					PRESENCE optional},
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject 	TYPE InterfaceInstanceIndication					PRESENCE optional }|
 -- NOTE: In the current version of this specification the Interface Instance Indication IE is not included in the Initiating NodeType IE --
+	{ ID id-CellandCapacityAssistInfo				CRITICALITY ignore	TYPE CellandCapacityAssistInfo						PRESENCE optional },
 	...
 }
 
@@ -3625,7 +3865,8 @@ ServedEUTRAcellsENDCX2Management-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 En-gNB-ENDCX2SetupReqIEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Globalen-gNB-ID							CRITICALITY reject	TYPE GlobalGNB-ID										PRESENCE mandatory}|
-	{ ID id-ServedNRcellsENDCX2ManagementList		CRITICALITY reject	TYPE ServedNRcellsENDCX2ManagementList			PRESENCE mandatory},
+	{ ID id-ServedNRcellsENDCX2ManagementList		CRITICALITY reject	TYPE ServedNRcellsENDCX2ManagementList			PRESENCE mandatory}|
+	{ ID id-PartialListIndicator						CRITICALITY ignore	TYPE PartialListIndicator								PRESENCE optional },
 	...
 }
 
@@ -3658,7 +3899,10 @@ ServedNRCell-Information ::= SEQUENCE {
 
 ServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	{ID id-additionalPLMNs-Item			CRITICALITY ignore	EXTENSION AdditionalPLMNs-Item			PRESENCE optional}|
-	{ ID id-BPLMN-ID-Info-NR				CRITICALITY ignore 	EXTENSION BPLMN-ID-Info-NR				PRESENCE optional},
+	{ ID id-BPLMN-ID-Info-NR				CRITICALITY ignore 	EXTENSION BPLMN-ID-Info-NR				PRESENCE optional}|
+	{ ID id-SSB-PositionsInBurst			CRITICALITY ignore	EXTENSION SSB-PositionsInBurst	PRESENCE optional}|
+	{ ID id-NRCellPRACHConfig				CRITICALITY ignore	EXTENSION NRCellPRACHConfig		PRESENCE optional}|
+	{ ID id-CSI-RSTransmissionIndication	CRITICALITY ignore	EXTENSION CSI-RSTransmissionIndication		PRESENCE optional},
 	...
 }
 
@@ -3672,6 +3916,8 @@ FDD-InfoServedNRCell-Information ::= SEQUENCE {
 }
 
 FDD-InfoServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-ULCarrierList					CRITICALITY ignore	EXTENSION NRCarrierList			PRESENCE optional }|
+	{ ID id-DLCarrierList					CRITICALITY ignore	EXTENSION NRCarrierList			PRESENCE optional },
 	...
 }
 
@@ -3683,6 +3929,19 @@ TDD-InfoServedNRCell-Information ::= SEQUENCE {
 }
 
 TDD-InfoServedNRCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-TDDULDLConfigurationCommonNR	CRITICALITY ignore	EXTENSION TDDULDLConfigurationCommonNR	PRESENCE optional}|
+	{ ID id-CarrierList						CRITICALITY ignore	EXTENSION NRCarrierList			PRESENCE optional},
+	...
+}
+
+CellandCapacityAssistInfo::= SEQUENCE {
+	maximumCellListSize								MaximumCellListSize			OPTIONAL,
+	cellAssistanceInformation						CellAssistanceInformation	OPTIONAL,
+	iE-Extensions									ProtocolExtensionContainer { {CellandCapacityAssistInfo-ExtIEs} } OPTIONAL,
+	...
+}
+
+CellandCapacityAssistInfo-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -3728,14 +3987,16 @@ RespondingNodeType-EndcX2Setup ::= CHOICE {
 ENB-ENDCX2SetupReqAckIEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-GlobalENB-ID								CRITICALITY reject	TYPE GlobalENB-ID										PRESENCE mandatory}|
 	{ ID id-ServedEUTRAcellsENDCX2ManagementList		CRITICALITY reject	TYPE ServedEUTRAcellsENDCX2ManagementList		PRESENCE mandatory}|
-	{ ID id-InterfaceInstanceIndication				CRITICALITY reject 	TYPE InterfaceInstanceIndication					PRESENCE optional },
+	{ ID id-InterfaceInstanceIndication				CRITICALITY reject 	TYPE InterfaceInstanceIndication					PRESENCE optional }|
+	{ ID id-CellandCapacityAssistInfo				CRITICALITY ignore	TYPE CellandCapacityAssistInfo						PRESENCE optional },
 	...
 }
 
 
 En-gNB-ENDCX2SetupReqAckIEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Globalen-gNB-ID							CRITICALITY reject	TYPE GlobalGNB-ID										PRESENCE mandatory}|
-	{ ID id-ServedNRcellsENDCX2ManagementList		CRITICALITY reject	TYPE ServedNRcellsENDCX2ManagementList			PRESENCE mandatory},
+	{ ID id-ServedNRcellsENDCX2ManagementList		CRITICALITY reject	TYPE ServedNRcellsENDCX2ManagementList			PRESENCE mandatory}|
+	{ ID id-PartialListIndicator						CRITICALITY ignore	TYPE PartialListIndicator								PRESENCE optional },
 	...
 }
 
@@ -3754,7 +4015,8 @@ ENDCX2SetupFailure-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Cause							CRITICALITY ignore		TYPE Cause								PRESENCE mandatory} |
 	{ ID id-CriticalityDiagnostics			CRITICALITY ignore		TYPE CriticalityDiagnostics				PRESENCE optional } |
 	{ ID id-TimeToWait						CRITICALITY ignore		TYPE TimeToWait							PRESENCE optional	} |
-	{ ID id-InterfaceInstanceIndication		CRITICALITY reject 		TYPE InterfaceInstanceIndication		PRESENCE optional },
+	{ ID id-InterfaceInstanceIndication		CRITICALITY reject 		TYPE InterfaceInstanceIndication		PRESENCE optional }|
+	{ ID id-MessageOversizeNotification		CRITICALITY ignore 		TYPE MessageOversizeNotification		PRESENCE optional },
 	...
 }
 
@@ -3771,7 +4033,11 @@ ENDCConfigurationUpdate ::= SEQUENCE {
 
 ENDCConfigurationUpdate-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-InitiatingNodeType-EndcConfigUpdate			CRITICALITY reject	TYPE InitiatingNodeType-EndcConfigUpdate			PRESENCE mandatory}|
-	{ ID id-InterfaceInstanceIndication					CRITICALITY reject 	TYPE InterfaceInstanceIndication						PRESENCE optional},
+	{ ID id-InterfaceInstanceIndication					CRITICALITY reject 	TYPE InterfaceInstanceIndication						PRESENCE optional}|
+	{ ID id-TNLConfigurationInfo						CRITICALITY ignore	TYPE TNLConfigurationInfo								PRESENCE optional	}|
+	{ ID id-TNLA-To-Add-List							CRITICALITY ignore	TYPE TNLA-To-Add-List										PRESENCE optional }|
+	{ ID id-TNLA-To-Update-List							CRITICALITY ignore	TYPE TNLA-To-Update-List									PRESENCE optional }|
+	{ ID id-TNLA-To-Remove-List							CRITICALITY ignore	TYPE TNLA-To-Remove-List									PRESENCE optional },
 	...
 }
 
@@ -3841,7 +4107,11 @@ ENDCConfigurationUpdateAcknowledge ::= SEQUENCE {
 
 ENDCConfigurationUpdateAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-RespondingNodeType-EndcConfigUpdate			CRITICALITY reject	TYPE RespondingNodeType-EndcConfigUpdate			PRESENCE mandatory}|
-	{ ID id-InterfaceInstanceIndication					CRITICALITY reject 	TYPE InterfaceInstanceIndication						PRESENCE optional },
+	{ ID id-InterfaceInstanceIndication					CRITICALITY reject 	TYPE InterfaceInstanceIndication						PRESENCE optional }|
+	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional }|
+	{ ID id-TNLConfigurationInfo						CRITICALITY ignore	TYPE TNLConfigurationInfo								PRESENCE optional }|
+	{ 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 },
 	...
 }
 
@@ -3965,6 +4235,133 @@ ENDCCellActivationFailure-IEs X2AP-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
+-- EN-DC RESOURCE STATUS REQUEST
+--
+-- **************************************************************
+
+ENDCResourceStatusRequest ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container	{{ENDCResourceStatusRequest-IEs}},
+	...
+}
+
+ENDCResourceStatusRequest-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-eNB-Measurement-ID-ENDC		CRITICALITY reject	TYPE Measurement-ID-ENDC		PRESENCE mandatory}|
+	{ ID id-engNB-Measurement-ID-ENDC	CRITICALITY ignore	TYPE Measurement-ID-ENDC		PRESENCE conditional}| -- The IE shall be present if the Registration Request IE is set to “Stop” or to “Add”
+	{ ID id-Registration-Request		CRITICALITY reject	TYPE Registration-Request-ENDC	PRESENCE mandatory}|
+	{ ID id-ReportingPeriodicity		CRITICALITY ignore	TYPE ReportingPeriodicity-ENDC	PRESENCE optional}|
+	{ ID id-ReportCharacteristics		CRITICALITY ignore	TYPE ReportCharacteristics-ENDC	PRESENCE conditional}| -- The IE shall be present if the Registration Request IE is set to “Start”
+	{ ID id-CellToReport-ENDC				CRITICALITY ignore	TYPE CellToReport-ENDC-List		PRESENCE optional},
+	...
+}
+
+ReportingPeriodicity-ENDC ::= ENUMERATED {ms500, ms1000, ms2000, ms5000, ms10000, ...}
+
+CellToReport-ENDC-List	::= SEQUENCE (SIZE (1..maxCellinengNB)) OF ProtocolIE-Single-Container { {CellToReport-ENDC-ItemIEs} }
+
+CellToReport-ENDC-ItemIEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CellToReport-ENDC-Item			CRITICALITY ignore	TYPE CellToReport-ENDC-Item		PRESENCE mandatory}
+}
+
+CellToReport-ENDC-Item				::= SEQUENCE {
+	cell-ID								NRCGI,
+	ssbToReport-List					SSBToReport-List									OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { {CellToReport-ENDC-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CellToReport-ENDC-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+SSBToReport-List	::= SEQUENCE (SIZE (1.. maxnoofSSBAreas)) OF SSBToReport-Item
+
+SSBToReport-Item	::= SEQUENCE {
+	ssbIndex							SSBIndex,
+	iE-Extensions						ProtocolExtensionContainer { {SSBToReport-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+SSBToReport-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- EN-DC RESOURCE STATUS RESPONSE
+--
+-- **************************************************************
+
+ENDCResourceStatusResponse ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container	{{ENDCResourceStatusResponse-IEs}},
+	...
+}
+
+ENDCResourceStatusResponse-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-eNB-Measurement-ID-ENDC		CRITICALITY reject	TYPE Measurement-ID-ENDC		PRESENCE mandatory}|
+	{ ID id-engNB-Measurement-ID-ENDC	CRITICALITY reject	TYPE Measurement-ID-ENDC		PRESENCE mandatory}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional},
+	...
+}
+
+-- **************************************************************
+--
+-- EN-DC RESOURCE STATUS FAILURE
+--
+-- **************************************************************
+
+ENDCResourceStatusFailure ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container	{{ENDCResourceStatusFailure-IEs}},
+	...
+}
+
+ENDCResourceStatusFailure-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-eNB-Measurement-ID-ENDC		CRITICALITY reject	TYPE Measurement-ID-ENDC		PRESENCE mandatory}|
+	{ ID id-engNB-Measurement-ID-ENDC	CRITICALITY reject	TYPE Measurement-ID-ENDC		PRESENCE mandatory}|
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional},
+	...
+}
+
+-- **************************************************************
+--
+-- EN-DC RESOURCE STATUS UPDATE
+--
+-- **************************************************************
+
+ENDCResourceStatusUpdate ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container	{{ENDCResourceStatusUpdate-IEs}},
+	...
+}
+
+ENDCResourceStatusUpdate-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-eNB-Measurement-ID-ENDC		CRITICALITY reject	TYPE Measurement-ID-ENDC		PRESENCE mandatory}|
+	{ ID id-engNB-Measurement-ID-ENDC	CRITICALITY reject	TYPE Measurement-ID-ENDC		PRESENCE mandatory}|
+	{ ID id-CellMeasurementResult-ENDC	CRITICALITY ignore	TYPE CellMeasurementResult-ENDC-List	PRESENCE optional },
+	...
+}
+
+CellMeasurementResult-ENDC-List ::= SEQUENCE (SIZE (1..maxCellinengNB)) OF ProtocolIE-Single-Container { {CellMeasurementResult-ENDC-ItemIEs} }
+
+CellMeasurementResult-ENDC-ItemIEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-CellMeasurementResult-ENDC-Item	CRITICALITY ignore	TYPE CellMeasurementResult-ENDC-Item	PRESENCE mandatory}
+}
+
+CellMeasurementResult-ENDC-Item ::= SEQUENCE {
+	cell-ID								NRCGI,
+	radioResourceStatus					NRRadioResourceStatus								OPTIONAL,
+	tnlCapacityIndicator				TNLCapacityIndicator								OPTIONAL,
+	compositeAvailableCapacityGroup		NRCompositeAvailableCapacityGroup					OPTIONAL,
+	numberofActiveUEs					INTEGER (0..16777215, ...)							OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { {CellMeasurementResult-ENDC-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+CellMeasurementResult-ENDC-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
 -- SECONDARY RAT DATA USAGE REPORT
 --
 -- **************************************************************
@@ -4226,7 +4623,8 @@ DataForwardingAddressIndication-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-New-eNB-UE-X2AP-ID-Extension		CRITICALITY ignore	TYPE UE-X2AP-ID-Extension						PRESENCE optional }|
 	{ ID id-Old-eNB-UE-X2AP-ID					CRITICALITY ignore	TYPE UE-X2AP-ID									PRESENCE mandatory}|
 	{ ID id-Old-eNB-UE-X2AP-ID-Extension		CRITICALITY ignore	TYPE UE-X2AP-ID-Extension						PRESENCE optional }|
-	{ ID id-E-RABs-DataForwardingAddress-List	CRITICALITY ignore	TYPE E-RABs-DataForwardingAddress-List		PRESENCE mandatory},
+	{ ID id-E-RABs-DataForwardingAddress-List	CRITICALITY ignore	TYPE E-RABs-DataForwardingAddress-List		PRESENCE mandatory}|
+	{ ID id-CHO-DC-Indicator					CRITICALITY reject	TYPE CHO-DC-Indicator							PRESENCE optional},
 	...
 }
 
@@ -4319,4 +4717,43 @@ DeactivateTraceIEs X2AP-PROTOCOL-IES ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- CELL TRAFFIC TRACE
+--
+-- **************************************************************
+
+CellTrafficTrace ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container		{ {CellTrafficTraceIEs} },
+	...
+}
+
+CellTrafficTraceIEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-MeNB-UE-X2AP-ID			CRITICALITY reject	TYPE UE-X2AP-ID						PRESENCE mandatory	}|
+	{ ID id-SgNB-UE-X2AP-ID			CRITICALITY reject	TYPE SgNB-UE-X2AP-ID				PRESENCE mandatory	}|
+	{ ID id-EUTRANTraceID			CRITICALITY ignore	TYPE EUTRANTraceID					PRESENCE mandatory	}|
+	{ ID id-TraceCollectionEntityIPAddress	CRITICALITY ignore	TYPE TransportLayerAddress		PRESENCE mandatory	}|
+	{ ID id-PrivacyIndicator				CRITICALITY ignore	TYPE PrivacyIndicator			PRESENCE optional	},
+	...
+}
+
+-- **************************************************************
+--
+-- F1-C TRAFFIC TRANSFER
+--
+-- **************************************************************
+
+F1CTrafficTransfer ::= SEQUENCE {
+	protocolIEs		ProtocolIE-Container		{{ F1CTrafficTransfer-IEs}},
+	...
+}
+
+F1CTrafficTransfer-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-MeNB-UE-X2AP-ID						CRITICALITY reject	TYPE UE-X2AP-ID					PRESENCE mandatory}|
+	{ ID id-SgNB-UE-X2AP-ID						CRITICALITY reject	TYPE SgNB-UE-X2AP-ID				PRESENCE mandatory}|
+	{ ID id-F1CTrafficContainer					CRITICALITY reject	TYPE F1CTrafficContainer			PRESENCE mandatory},
+	...
+}
+
+
 END
diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
index 4ed07e0c88..fd7ce8f23c 100644
--- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.423 V15.9.0 (2020-03)
+-- 3GPP TS 36.423 V16.2.0 (2020-07)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -119,7 +119,18 @@ FROM X2AP-CommonDataTypes
 	GNBStatusIndication,
 	ENDCConfigurationTransfer,
 	DeactivateTrace,
-	TraceStart
+	TraceStart,
+	HandoverSuccess,
+	EarlyStatusTransfer,
+	ConditionalHandoverCancel,
+	ENDCResourceStatusRequest,
+	ENDCResourceStatusResponse,
+	ENDCResourceStatusFailure,
+	ENDCResourceStatusUpdate,
+	CellTrafficTrace,
+	F1CTrafficTransfer
+
+
 
 
 FROM X2AP-PDU-Contents
@@ -174,7 +185,15 @@ FROM X2AP-PDU-Contents
 	id-gNBStatusIndication,
 	id-endcConfigurationTransfer,
 	id-deactivateTrace,
-	id-traceStart
+	id-traceStart,
+	id-handoverSuccess,
+	id-earlyStatusTransfer,
+	id-conditionalHandoverCancel,
+	id-endcresourceStatusReporting,
+	id-endcresourceStatusReportingInitiation,
+	id-cellTrafficTrace,
+	id-f1CTrafficTransfer
+
 
 
 
@@ -269,7 +288,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
 	endcCellActivation										|
 	endcPartialReset											|
 	eUTRANRCellResourceCoordination							|
-	endcX2Removal											,
+	endcX2Removal											|
+	endcresourceStatusReportingInitiation					,
 	...
 }
 
@@ -297,7 +317,13 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
 	gNBStatusIndication						|
 	endcConfigurationTransfer				|
 	deactivateTrace							|
-	traceStart								,
+	traceStart								|
+	handoverSuccess							|
+	earlyStatusTransfer						|
+	conditionalHandoverCancel				|
+	endcresourceStatusReporting				|
+	cellTrafficTrace						|
+	f1CTrafficTransfer						,
 	...
 
 }
@@ -651,4 +677,48 @@ traceStart X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+handoverSuccess X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		HandoverSuccess
+	PROCEDURE CODE			id-handoverSuccess
+	CRITICALITY				ignore
+}
+
+earlyStatusTransfer		X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		EarlyStatusTransfer
+	PROCEDURE CODE			id-earlyStatusTransfer
+	CRITICALITY				ignore
+}
+
+conditionalHandoverCancel X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ConditionalHandoverCancel
+	PROCEDURE CODE			id-conditionalHandoverCancel
+	CRITICALITY				ignore
+}
+
+endcresourceStatusReportingInitiation	X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENDCResourceStatusRequest
+	SUCCESSFUL OUTCOME		ENDCResourceStatusResponse
+	UNSUCCESSFUL OUTCOME	ENDCResourceStatusFailure
+	PROCEDURE CODE			id-endcresourceStatusReportingInitiation
+	CRITICALITY				reject
+}
+
+endcresourceStatusReporting		X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENDCResourceStatusUpdate
+	PROCEDURE CODE			id-endcresourceStatusReporting
+	CRITICALITY				ignore
+}
+
+cellTrafficTrace X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		CellTrafficTrace
+	PROCEDURE CODE			id-cellTrafficTrace
+	CRITICALITY				ignore
+}
+
+f1CTrafficTransfer			X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		F1CTrafficTransfer
+	PROCEDURE CODE			id-f1CTrafficTransfer
+	CRITICALITY				ignore
+}
+
 END
diff --git a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
index b03725151c..5f0eea6bab 100644
--- a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
+++ b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 36.423 V15.9.0 (2020-03)
+ * 3GPP TS 36.423 V16.2.0 (2020-07)
  */
 
 #include "config.h"
@@ -115,6 +115,14 @@ static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA1 = -1;
 static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA2 = -1;
 static int hf_x2ap_NRintegrityProtectionAlgorithms_NIA3 = -1;
 static int hf_x2ap_NRintegrityProtectionAlgorithms_Reserved = -1;
+static int hf_x2ap_ReportCharacteristics_ENDC_PRBPeriodic = -1;
+static int hf_x2ap_ReportCharacteristics_ENDC_TNLCapacityIndPeriodic = -1;
+static int hf_x2ap_ReportCharacteristics_ENDC_CompositeAvailableCapacityPeriodic = -1;
+static int hf_x2ap_ReportCharacteristics_ENDC_NumberOfActiveUEs = -1;
+static int hf_x2ap_ReportCharacteristics_ENDC_Reserved = -1;
+static int hf_x2ap_Registration_Request_ENDC_PDU = -1;
+static int hf_x2ap_ReportingPeriodicity_ENDC_PDU = -1;
+static int hf_x2ap_ReportCharacteristics_ENDC_PDU = -1;
 #include "packet-x2ap-hf.c"
 
 /* Initialize the subtree pointers */
@@ -149,12 +157,33 @@ static int ett_x2ap_LastVisitedNGRANCellInformation = -1;
 static int ett_x2ap_LastVisitedUTRANCellInformation = -1;
 static int ett_x2ap_EndcSONConfigurationTransfer = -1;
 static int ett_x2ap_EPCHandoverRestrictionListContainer = -1;
+static int ett_x2ap_NBIoT_RLF_Report_Container = -1;
+static int ett_x2ap_anchorCarrier_NPRACHConfig = -1;
+static int ett_x2ap_anchorCarrier_EDT_NPRACHConfig = -1;
+static int ett_x2ap_anchorCarrier_Format2_NPRACHConfig = -1;
+static int ett_x2ap_anchorCarrier_Format2_EDT_NPRACHConfig = -1;
+static int ett_x2ap_non_anchorCarrier_NPRACHConfig = -1;
+static int ett_x2ap_non_anchorCarrier_Format2_NPRACHConfig = -1;
+static int ett_x2ap_anchorCarrier_NPRACHConfigTDD = -1;
+static int ett_x2ap_non_anchorCarrier_NPRACHConfigTDD = -1;
+static int ett_x2ap_Non_anchorCarrierFrequency = -1;
+static int ett_x2ap_ReportCharacteristics_ENDC = -1;
+static int ett_x2ap_TargetCellInNGRAN = -1;
+static int ett_x2ap_TDDULDLConfigurationCommonNR = -1;
 #include "packet-x2ap-ett.c"
 
+/* Forward declarations */
+static int dissect_x2ap_Registration_Request_ENDC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
+static int dissect_x2ap_ReportCharacteristics_ENDC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
+static int dissect_x2ap_ReportingPeriodicity_ENDC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
+
 typedef enum {
   RRC_CONTAINER_TYPE_UNKNOWN,
   RRC_CONTAINER_TYPE_PDCP_C_PDU,
-  RRC_CONTAINER_TYPE_NR_UE_MEAS_REPORT
+  RRC_CONTAINER_TYPE_NR_UE_MEAS_REPORT,
+  RRC_CONTAINER_TYPE_FAST_MCG_RECOVERY_SgNB_TO_MeNB,
+  RRC_CONTAINER_TYPE_FAST_MCG_RECOVERY_MeNB_TO_SgNB,
+  RRC_CONTAINER_TYPE_IAB_INFO
 } rrc_container_type_e;
 
 enum{
@@ -574,6 +603,38 @@ void proto_register_x2ap(void) {
       { "Reserved", "x2ap.NRintegrityProtectionAlgorithms.Reserved",
         FT_UINT16, BASE_HEX, NULL, 0x1fff,
         NULL, HFILL }},
+    { &hf_x2ap_ReportCharacteristics_ENDC_PRBPeriodic,
+      { "PRBPeriodic", "x2ap.ReportCharacteristics_ENDC.PRBPeriodic",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x80000000,
+        NULL, HFILL }},
+    { &hf_x2ap_ReportCharacteristics_ENDC_TNLCapacityIndPeriodic,
+      { "TNLCapacityIndPeriodic", "x2ap.ReportCharacteristics_ENDC.TNLCapacityIndPeriodic",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x40000000,
+        NULL, HFILL }},
+    { &hf_x2ap_ReportCharacteristics_ENDC_CompositeAvailableCapacityPeriodic,
+      { "CompositeAvailableCapacityPeriodic", "x2ap.ReportCharacteristics_ENDC.CompositeAvailableCapacityPeriodic",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x20000000,
+        NULL, HFILL }},
+    { &hf_x2ap_ReportCharacteristics_ENDC_NumberOfActiveUEs,
+      { "NumberOfActiveUEs", "x2ap.ReportCharacteristics_ENDC.NumberOfActiveUEs",
+        FT_BOOLEAN, 32, TFS(&tfs_requested_not_requested), 0x10000000,
+        NULL, HFILL }},
+    { &hf_x2ap_ReportCharacteristics_ENDC_Reserved,
+      { "Reserved", "x2ap.ReportCharacteristics_ENDC.Reserved",
+        FT_UINT32, BASE_HEX, NULL, 0x0fffffff,
+        NULL, HFILL }},
+    { &hf_x2ap_Registration_Request_ENDC_PDU,
+      { "Registration-Request-ENDC", "x2ap.Registration_Request_ENDC",
+        FT_UINT32, BASE_DEC, VALS(x2ap_Registration_Request_ENDC_vals), 0,
+        NULL, HFILL }},
+    { &hf_x2ap_ReportingPeriodicity_ENDC_PDU,
+      { "ReportingPeriodicity-ENDC", "x2ap.ReportingPeriodicity_ENDC",
+        FT_UINT32, BASE_DEC, VALS(x2ap_ReportingPeriodicity_ENDC_vals), 0,
+        NULL, HFILL }},
+    { &hf_x2ap_ReportCharacteristics_ENDC_PDU,
+      { "ReportCharacteristics-ENDC", "x2ap.ReportCharacteristics_ENDC",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
 #include "packet-x2ap-hfarr.c"
   };
 
@@ -610,6 +671,19 @@ void proto_register_x2ap(void) {
     &ett_x2ap_LastVisitedUTRANCellInformation,
     &ett_x2ap_EndcSONConfigurationTransfer,
     &ett_x2ap_EPCHandoverRestrictionListContainer,
+    &ett_x2ap_NBIoT_RLF_Report_Container,
+    &ett_x2ap_anchorCarrier_NPRACHConfig,
+    &ett_x2ap_anchorCarrier_EDT_NPRACHConfig,
+    &ett_x2ap_anchorCarrier_Format2_NPRACHConfig,
+    &ett_x2ap_anchorCarrier_Format2_EDT_NPRACHConfig,
+    &ett_x2ap_non_anchorCarrier_NPRACHConfig,
+    &ett_x2ap_non_anchorCarrier_Format2_NPRACHConfig,
+    &ett_x2ap_anchorCarrier_NPRACHConfigTDD,
+    &ett_x2ap_non_anchorCarrier_NPRACHConfigTDD,
+    &ett_x2ap_Non_anchorCarrierFrequency,
+    &ett_x2ap_ReportCharacteristics_ENDC,
+    &ett_x2ap_TargetCellInNGRAN,
+    &ett_x2ap_TDDULDLConfigurationCommonNR,
 #include "packet-x2ap-ettarr.c"
   };
 
diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf
index 810986b8b9..ce9af1e3d3 100644
--- a/epan/dissectors/asn1/x2ap/x2ap.cnf
+++ b/epan/dissectors/asn1/x2ap/x2ap.cnf
@@ -224,6 +224,15 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
   subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_UE_RLF_Report_Container_for_extended_bands);
   dissect_lte_rrc_RLF_Report_v9e0_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
 
+#.FN_BODY NBIoT-RLF-Report-Container VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (!parameter_tvb)
+    return offset;
+  subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_NBIoT_RLF_Report_Container);
+  dissect_lte_rrc_RLF_Report_NB_r16_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+
 #.FN_BODY MeNBtoSeNBContainer VAL_PTR = &parameter_tvb
  tvbuff_t *parameter_tvb;
  proto_tree *subtree = NULL;
@@ -278,6 +287,19 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
 
   x2ap_data->rrc_container_type = RRC_CONTAINER_TYPE_NR_UE_MEAS_REPORT;
 
+#.FN_HDR FastMCGRecovery
+  struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);
+
+  if (x2ap_data->protocol_ie_id == id_FastMCGRecovery_SN_to_MN)
+    x2ap_data->rrc_container_type = RRC_CONTAINER_TYPE_FAST_MCG_RECOVERY_SgNB_TO_MeNB;
+  else if (x2ap_data->protocol_ie_id == id_FastMCGRecovery_MN_to_SN)
+    x2ap_data->rrc_container_type = RRC_CONTAINER_TYPE_FAST_MCG_RECOVERY_MeNB_TO_SgNB;
+
+#.FN_HDR IABInformation
+  struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);
+
+  x2ap_data->rrc_container_type = RRC_CONTAINER_TYPE_IAB_INFO;
+
 #.FN_BODY RRCContainer VAL_PTR = &parameter_tvb
   tvbuff_t *parameter_tvb;
   proto_tree *subtree = NULL;
@@ -285,10 +307,24 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
 %(DEFAULT_BODY)s
   if (!parameter_tvb)
     return offset;
-  if (x2ap_data->rrc_container_type == RRC_CONTAINER_TYPE_NR_UE_MEAS_REPORT) {
-    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_RRCContainer);
-    dissect_nr_rrc_UL_DCCH_Message_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  switch (x2ap_data->rrc_container_type) {
+    case RRC_CONTAINER_TYPE_NR_UE_MEAS_REPORT:
+    case RRC_CONTAINER_TYPE_IAB_INFO:
+      subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_RRCContainer);
+      dissect_nr_rrc_UL_DCCH_Message_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+      break;
+    case RRC_CONTAINER_TYPE_FAST_MCG_RECOVERY_SgNB_TO_MeNB:
+      subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_RRCContainer);
+      dissect_lte_rrc_UL_DCCH_Message_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+      break;
+    case RRC_CONTAINER_TYPE_FAST_MCG_RECOVERY_MeNB_TO_SgNB:
+      subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_RRCContainer);
+      dissect_lte_rrc_DL_DCCH_Message_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+      break;
+    default:
+      break;
   }
+  x2ap_data->rrc_container_type = RRC_CONTAINER_TYPE_UNKNOWN;
 
 #.FN_BODY EUTRANTraceID VAL_PTR = &parameter_tvb
   tvbuff_t *parameter_tvb;
@@ -677,6 +713,136 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING
     dissect_s1ap_HandoverRestrictionList_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
   }
 
+#.FN_BODY NPRACHConfiguration-FDD/anchorCarrier-NPRACHConfig VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_anchorCarrier_NPRACHConfig);
+    dissect_lte_rrc_NPRACH_ParametersList_NB_r13_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY NPRACHConfiguration-FDD/anchorCarrier-EDT-NPRACHConfig VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_anchorCarrier_EDT_NPRACHConfig);
+    dissect_lte_rrc_NPRACH_ParametersList_NB_r14_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY NPRACHConfiguration-FDD/anchorCarrier-Format2-NPRACHConfig VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_anchorCarrier_Format2_NPRACHConfig);
+    dissect_lte_rrc_NPRACH_ParametersListFmt2_NB_r15_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY NPRACHConfiguration-FDD/anchorCarrier-Format2-EDT-NPRACHConfig VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_anchorCarrier_Format2_EDT_NPRACHConfig);
+    dissect_lte_rrc_NPRACH_ParametersListFmt2_NB_r15_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY NPRACHConfiguration-FDD/non-anchorCarrier-NPRACHConfig VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_non_anchorCarrier_NPRACHConfig);
+    dissect_lte_rrc_UL_ConfigCommonList_NB_r14_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY NPRACHConfiguration-FDD/non-anchorCarrier-Format2-NPRACHConfig VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_non_anchorCarrier_Format2_NPRACHConfig);
+    dissect_lte_rrc_UL_ConfigCommonList_NB_v1530_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY NPRACHConfiguration-TDD/anchorCarrier-NPRACHConfigTDD VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_anchorCarrier_NPRACHConfigTDD);
+    dissect_lte_rrc_NPRACH_ParametersListTDD_NB_r15_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY NPRACHConfiguration-TDD/non-anchorCarrier-NPRACHConfigTDD VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_non_anchorCarrier_NPRACHConfigTDD);
+    dissect_lte_rrc_UL_ConfigCommonListTDD_NB_r15_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY Non-anchorCarrierFrequency VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_Non_anchorCarrierFrequency);
+    dissect_lte_rrc_DL_CarrierConfigCommon_NB_r14_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY ReportCharacteristics-ENDC VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+%(DEFAULT_BODY)s
+  if(parameter_tvb){
+    static int * const fields[] = {
+      &hf_x2ap_ReportCharacteristics_ENDC_PRBPeriodic,
+      &hf_x2ap_ReportCharacteristics_ENDC_TNLCapacityIndPeriodic,
+      &hf_x2ap_ReportCharacteristics_ENDC_CompositeAvailableCapacityPeriodic,
+      &hf_x2ap_ReportCharacteristics_ENDC_NumberOfActiveUEs,
+      &hf_x2ap_ReportCharacteristics_ENDC_Reserved,
+      NULL
+    };
+    proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_ReportCharacteristics_ENDC);
+    proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 4, fields, ENC_BIG_ENDIAN);
+  }
+
+#.FN_BODY TargetCellInNGRAN VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_TargetCellInNGRAN);
+    dissect_ngap_NGRAN_CGI_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_BODY TDDULDLConfigurationCommonNR VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb = NULL;
+  proto_tree *subtree;
+%(DEFAULT_BODY)s
+  if (parameter_tvb) {
+    subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_TDDULDLConfigurationCommonNR);
+    dissect_nr_rrc_TDD_UL_DL_ConfigCommon_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
+  }
+
+#.FN_HDR Registration-Request
+  struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);
+  if (x2ap_data->procedure_code == id_endcresourceStatusReportingInitiation)
+    return dissect_x2ap_Registration_Request_ENDC(tvb, offset, actx, tree, hf_x2ap_Registration_Request_ENDC_PDU);
+
+#.FN_HDR ReportingPeriodicity
+  struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);
+  if (x2ap_data->procedure_code == id_endcresourceStatusReportingInitiation)
+    return dissect_x2ap_ReportingPeriodicity_ENDC(tvb, offset, actx, tree, hf_x2ap_ReportingPeriodicity_ENDC_PDU);
+
+#.FN_HDR ReportCharacteristics
+  struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo);
+  if (x2ap_data->procedure_code == id_endcresourceStatusReportingInitiation)
+    return dissect_x2ap_ReportCharacteristics_ENDC(tvb, offset, actx, tree, hf_x2ap_ReportCharacteristics_ENDC_PDU);
+
 #.END
 
 #.FN_HDR HandoverRequest
@@ -867,6 +1033,24 @@ ScheduledCommunicationTime/timeofDayEnd DISPLAY=BASE_DEC|BASE_UNIT_STRING STRING
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DeactivateTrace");
 #.FN_HDR TraceStart
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceStart");
+#.FN_HDR HandoverSuccess
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverSuccess");
+#.FN_HDR EarlyStatusTransfer
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "EarlyStatusTransfer");
+#.FN_HDR ConditionalHandoverCancel
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ConditionalHandoverCancel");
+#.FN_HDR ENDCResourceStatusRequest
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCResourceStatusRequest");
+#.FN_HDR ENDCResourceStatusResponse
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCResourceStatusResponse");
+#.FN_HDR ENDCResourceStatusFailure
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCResourceStatusFailure");
+#.FN_HDR ENDCResourceStatusUpdate
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ENDCResourceStatusUpdate");
+#.FN_HDR CellTrafficTrace
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellTrafficTrace");
+#.FN_HDR F1CTrafficTransfer
+  col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "F1CTrafficTransfer");
 
 #.ASSIGN_VALUE_TO_TYPE  # X2AP does not have constants assigned to types, they are pure INTEGER
 # ProcedureCode
@@ -920,6 +1104,14 @@ id-gNBStatusIndication						ProcedureCode
 id-deactivateTrace						ProcedureCode
 id-traceStart							ProcedureCode
 id-endcConfigurationTransfer					ProcedureCode
+id-handoverSuccess						ProcedureCode
+id-conditionalHandoverCancel					ProcedureCode
+id-earlyStatusTransfer						ProcedureCode
+id-cellTrafficTrace 						ProcedureCode
+id-endcresourceStatusReporting					ProcedureCode
+id-endcresourceStatusReportingInitiation			ProcedureCode
+id-f1CTrafficTransfer						ProcedureCode
+
 
 # ProtocolIE-ID
 
@@ -1253,7 +1445,65 @@ id-BPLMN-ID-Info-EUTRA						ProtocolIE-ID
 id-BPLMN-ID-Info-NR						ProtocolIE-ID
 id-NBIoT-UL-DL-AlignmentOffset					ProtocolIE-ID
 id-ERABs-transferred-to-MeNB					ProtocolIE-ID
+id-AdditionalRRMPriorityIndex					ProtocolIE-ID
+id-LowerLayerPresenceStatusChange				ProtocolIE-ID
+id-FastMCGRecovery-SN-to-MN					ProtocolIE-ID
+id-RequestedFastMCGRecoveryViaSRB3				ProtocolIE-ID
+id-AvailableFastMCGRecoveryViaSRB3				ProtocolIE-ID
+id-RequestedFastMCGRecoveryViaSRB3Release			ProtocolIE-ID
+id-ReleaseFastMCGRecoveryViaSRB3				ProtocolIE-ID
+id-FastMCGRecovery-MN-to-SN					ProtocolIE-ID
+id-PartialListIndicator						ProtocolIE-ID
+id-MaximumCellListSize						ProtocolIE-ID
+id-MessageOversizeNotification					ProtocolIE-ID
+id-CellandCapacityAssistInfo					ProtocolIE-ID
+id-TNLConfigurationInfo						ProtocolIE-ID
+id-TNLA-To-Add-List						ProtocolIE-ID
+id-TNLA-To-Update-List						ProtocolIE-ID
+id-TNLA-To-Remove-List						ProtocolIE-ID
+id-TNLA-Setup-List						ProtocolIE-ID
+id-TNLA-Failed-To-Setup-List					ProtocolIE-ID
+id-UnlicensedSpectrumRestriction				ProtocolIE-ID
+id-UEContextReferenceatSourceNGRAN				ProtocolIE-ID
 id-EPCHandoverRestrictionListContainer				ProtocolIE-ID
+id-CHOinformation-REQ						ProtocolIE-ID
+id-CHOinformation-ACK						ProtocolIE-ID
+id-DAPSRequestInfo						ProtocolIE-ID
+id-RequestedTargetCellID					ProtocolIE-ID
+id-CandidateCellsToBeCancelledList				ProtocolIE-ID
+id-DAPSResponseInfo						ProtocolIE-ID
+id-ProcedureStage						ProtocolIE-ID
+id-CHO-DC-Indicator						ProtocolIE-ID
+id-Ethernet-Type						ProtocolIE-ID
+id-NRV2XServicesAuthorized					ProtocolIE-ID
+id-NRUESidelinkAggregateMaximumBitRate				ProtocolIE-ID
+id-PC5QoSParameters						ProtocolIE-ID
+id-NPRACHConfiguration						ProtocolIE-ID
+id-NBIoT-RLF-Report-Container					ProtocolIE-ID
+id-MDTConfigurationNR						ProtocolIE-ID
+id-PrivacyIndicator						ProtocolIE-ID
+id-TraceCollectionEntityIPAddress				ProtocolIE-ID
+id-UERadioCapabilityID						ProtocolIE-ID
+id-SNtriggered							ProtocolIE-ID
+id-CSI-RSTransmissionIndication					ProtocolIE-ID
+id-DLCarrierList						ProtocolIE-ID
+id-TargetCellInNGRAN						ProtocolIE-ID
+id-eNB-Measurement-ID-ENDC					ProtocolIE-ID
+id-engNB-Measurement-ID-ENDC					ProtocolIE-ID
+id-TDDULDLConfigurationCommonNR					ProtocolIE-ID
+id-CarrierList							ProtocolIE-ID
+id-ULCarrierList						ProtocolIE-ID
+id-FrequencyShift7p5khz						ProtocolIE-ID
+id-SSB-PositionsInBurst						ProtocolIE-ID
+id-NRCellPRACHConfig						ProtocolIE-ID
+id-CellToReport-ENDC						ProtocolIE-ID
+id-CellToReport-ENDC-Item					ProtocolIE-ID
+id-CellMeasurementResult-ENDC					ProtocolIE-ID
+id-CellMeasurementResult-ENDC-Item				ProtocolIE-ID
+id-IABNodeIndication						ProtocolIE-ID
+id-QoS-Mapping-Information					ProtocolIE-ID
+id-F1CTrafficContainer						ProtocolIE-ID
+id-IABInformation						ProtocolIE-ID
 
 #.REGISTER
 
@@ -1490,6 +1740,47 @@ LocationInformationSgNB						N x2ap.ies id-LocationInformationSgNB
 EUTRANTraceID							N x2ap.ies id-EUTRANTraceID
 InterfaceInstanceIndication					N x2ap.ies id-InterfaceInstanceIndication
 E-RAB-List							N x2ap.ies id-ERABs-transferred-to-MeNB
+AdditionalRRMPriorityIndex					N x2ap.ies id-AdditionalRRMPriorityIndex
+FastMCGRecovery							N x2ap.ies id-FastMCGRecovery-SN-to-MN
+RequestedFastMCGRecoveryViaSRB3					N x2ap.ies id-RequestedFastMCGRecoveryViaSRB3
+AvailableFastMCGRecoveryViaSRB3					N x2ap.ies id-AvailableFastMCGRecoveryViaSRB3
+RequestedFastMCGRecoveryViaSRB3Release				N x2ap.ies id-RequestedFastMCGRecoveryViaSRB3Release
+ReleaseFastMCGRecoveryViaSRB3					N x2ap.ies id-ReleaseFastMCGRecoveryViaSRB3
+FastMCGRecovery							N x2ap.ies id-FastMCGRecovery-MN-to-SN
+PartialListIndicator						N x2ap.ies id-PartialListIndicator
+# id-MaximumCellListSize
+MessageOversizeNotification					N x2ap.ies id-MessageOversizeNotification
+CellandCapacityAssistInfo					N x2ap.ies id-CellandCapacityAssistInfo
+TNLConfigurationInfo						N x2ap.ies id-TNLConfigurationInfo
+TNLA-To-Add-List						N x2ap.ies id-TNLA-To-Add-List
+TNLA-To-Update-List						N x2ap.ies id-TNLA-To-Update-List
+TNLA-To-Remove-List						N x2ap.ies id-TNLA-To-Remove-List
+TNLA-Setup-List							N x2ap.ies id-TNLA-Setup-List
+TNLA-Failed-To-Setup-List					N x2ap.ies id-TNLA-Failed-To-Setup-List
+RAN-UE-NGAP-ID							N x2ap.ies id-UEContextReferenceatSourceNGRAN
+CHOinformation-REQ						N x2ap.ies id-CHOinformation-REQ
+CHOinformation-ACK						N x2ap.ies id-CHOinformation-ACK
+ECGI								N x2ap.ies id-RequestedTargetCellID
+CandidateCellsToBeCancelledList					N x2ap.ies id-CandidateCellsToBeCancelledList
+ProcedureStageChoice						N x2ap.ies id-ProcedureStage
+CHO-DC-Indicator						N x2ap.ies id-CHO-DC-Indicator
+NRV2XServicesAuthorized						N x2ap.ies id-NRV2XServicesAuthorized
+PC5QoSParameters						N x2ap.ies id-PC5QoSParameters
+NBIoT-RLF-Report-Container					N x2ap.ies id-NBIoT-RLF-Report-Container
+PrivacyIndicator						N x2ap.ies id-PrivacyIndicator
+TransportLayerAddress						N x2ap.ies id-TraceCollectionEntityIPAddress
+UERadioCapabilityID						N x2ap.ies id-UERadioCapabilityID
+SNtriggered							N x2ap.ies id-SNtriggered
+TargetCellInNGRAN						N x2ap.ies id-TargetCellInNGRAN
+Measurement-ID-ENDC						N x2ap.ies id-eNB-Measurement-ID-ENDC
+Measurement-ID-ENDC						N x2ap.ies id-engNB-Measurement-ID-ENDC
+CellToReport-ENDC-List						N x2ap.ies id-CellToReport-ENDC
+CellToReport-ENDC-Item						N x2ap.ies id-CellToReport-ENDC-Item
+CellMeasurementResult-ENDC-List					N x2ap.ies id-CellMeasurementResult-ENDC
+CellMeasurementResult-ENDC-Item					N x2ap.ies id-CellMeasurementResult-ENDC-Item
+IABNodeIndication						N x2ap.ies id-IABNodeIndication
+F1CTrafficContainer						N x2ap.ies id-F1CTrafficContainer
+IABInformation							N x2ap.ies id-IABInformation
 
 #X2AP-PROTOCOL-EXTENSION
 Number-of-Antennaports						N x2ap.extension id-Number-of-Antennaports
@@ -1589,6 +1880,25 @@ BPLMN-ID-Info-EUTRA						N x2ap.extension id-BPLMN-ID-Info-EUTRA
 BPLMN-ID-Info-NR						N x2ap.extension id-BPLMN-ID-Info-NR
 NBIoT-UL-DL-AlignmentOffset					N x2ap.extension id-NBIoT-UL-DL-AlignmentOffset
 EPCHandoverRestrictionListContainer				N x2ap.extension id-EPCHandoverRestrictionListContainer
+AdditionalRRMPriorityIndex					N x2ap.extension id-AdditionalRRMPriorityIndex
+LowerLayerPresenceStatusChange					N x2ap.extension id-LowerLayerPresenceStatusChange
+UnlicensedSpectrumRestriction					N x2ap.extension id-UnlicensedSpectrumRestriction
+DAPSRequestInfo							N x2ap.extension id-DAPSRequestInfo
+DAPSResponseInfo						N x2ap.extension id-DAPSResponseInfo
+Ethernet-Type							N x2ap.extension id-Ethernet-Type
+NRUESidelinkAggregateMaximumBitRate				N x2ap.extension id-NRUESidelinkAggregateMaximumBitRate
+NPRACHConfiguration						N x2ap.extension id-NPRACHConfiguration
+MDT-ConfigurationNR						N x2ap.extension id-MDTConfigurationNR
+UERadioCapabilityID						N x2ap.extension id-UERadioCapabilityID
+CSI-RSTransmissionIndication					N x2ap.extension id-CSI-RSTransmissionIndication
+NRCarrierList							N x2ap.extension id-DLCarrierList
+TDDULDLConfigurationCommonNR					N x2ap.extension id-TDDULDLConfigurationCommonNR
+NRCarrierList							N x2ap.extension id-CarrierList
+NRCarrierList							N x2ap.extension id-ULCarrierList
+FrequencyShift7p5khz						N x2ap.extension id-FrequencyShift7p5khz
+SSB-PositionsInBurst						N x2ap.extension id-SSB-PositionsInBurst
+NRCellPRACHConfig						N x2ap.extension id-NRCellPRACHConfig
+QoS-Mapping-Information						N x2ap.extension id-QoS-Mapping-Information
 
 # X2AP-PDU-Descriptions.asn  Interface Elementary Procedures
 #X2AP-ELEMENTARY-PROCEDURE
@@ -1734,4 +2044,20 @@ ENDCConfigurationTransfer			N x2ap.proc.imsg id-endcConfigurationTransfer
 DeactivateTrace					N x2ap.proc.imsg id-deactivateTrace
 
 TraceStart					N x2ap.proc.imsg id-traceStart
+
+HandoverSuccess					N x2ap.proc.imsg id-handoverSuccess
+
+EarlyStatusTransfer				N x2ap.proc.imsg id-earlyStatusTransfer
+
+ConditionalHandoverCancel			N x2ap.proc.imsg id-conditionalHandoverCancel
+
+ENDCResourceStatusRequest			N x2ap.proc.imsg id-endcresourceStatusReportingInitiation
+ENDCResourceStatusResponse			N x2ap.proc.sout id-endcresourceStatusReportingInitiation
+ENDCResourceStatusFailure			N x2ap.proc.uout id-endcresourceStatusReportingInitiation
+
+ENDCResourceStatusUpdate			N x2ap.proc.imsg id-endcresourceStatusReporting
+
+CellTrafficTrace				N x2ap.proc.imsg id-cellTrafficTrace
+
+F1CTrafficTransfer				N x2ap.proc.imsg id-f1CTrafficTransfer
 #.END
author	Pascal Quantin <pascal@wireshark.org>	2020-08-20 17:08:32 +0200
committer	Pascal Quantin <pascal@wireshark.org>	2020-08-20 21:39:50 +0000
commit	4707c16adde2e002b82d54202117b1df58a5c215 (patch)
tree	ffc3b69dae3f19455f19cbe97092d9948b9b0ca1 /epan/dissectors/asn1/x2ap
parent	df69e61cb6bc3910975d864175a1f64476fcd25c (diff)