[RANAP] Update to 3GPP TS 25.413 V13.2.0 (2016-06)

Change-Id: I1f6cc99761e13cd09811a4cebca145c47d5b4eca
Reviewed-on: https://code.wireshark.org/review/20657
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

7 files changed, 721 insertions, 88 deletions

diff --git a/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn b/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn
index 30e9d3e96f..662d2770cf 100644
--- a/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- RANAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.413 V10.4.0 (2011-12)
+-- 3GPP TS 25.413 V13.2.0 (2016-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.5	Common Definitions
@@ -38,4 +38,3 @@ ProtocolIE-ID		::= INTEGER (0..65535)
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome, outcome }
 
 END
-
diff --git a/epan/dissectors/asn1/ranap/RANAP-Constants.asn b/epan/dissectors/asn1/ranap/RANAP-Constants.asn
index 1cc1fab27f..2deaebfd12 100644
--- a/epan/dissectors/asn1/ranap/RANAP-Constants.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-Constants.asn
@@ -1,6 +1,6 @@
 -- RANAP-Constants.asn
 --
--- 3GPP TS 25.413 V10.4.0 (2011-12)
+-- 3GPP TS 25.413 V13.2.0 (2016-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.6	Constant Definitions
@@ -72,8 +72,9 @@ id-enhancedRelocationComplete		INTEGER ::= 43
 id-enhancedRelocationCompleteConfirm	INTEGER ::= 44
 id-RANAPenhancedRelocation			INTEGER ::= 45
 id-SRVCCPreparation					INTEGER ::= 46
-
-
+id-UeRadioCapabilityMatch					INTEGER ::= 47
+id-UeRegistrationQuery						INTEGER ::= 48
+id-RerouteNASRequest						INTEGER ::= 49
 
 -- **************************************************************
 --
@@ -122,6 +123,9 @@ maxNrOfEUTRAFreqs					INTEGER ::= 8
 maxNrOfCellIds						INTEGER ::= 32
 maxNrOfRAIs							INTEGER ::= 8
 maxNrOfLAIs							INTEGER ::= 8
+maxSizeOfIMSInfo					INTEGER ::= 32
+maxnoofMDTPLMNs						INTEGER ::= 16
+maxAddPosSet						INTEGER ::= 8
 
 -- **************************************************************
 --
@@ -130,8 +134,8 @@ maxNrOfLAIs							INTEGER ::= 8
 -- **************************************************************
 
 id-AreaIdentity 								INTEGER ::= 0
-id-Not-Used-1									INTEGER ::= 1
-id-Not-Used-2									INTEGER ::= 2
+id-Not-Used-1 									INTEGER ::= 1
+id-Not-Used-2 									INTEGER ::= 2
 id-CN-DomainIndicator 							INTEGER ::= 3
 id-Cause 										INTEGER ::= 4
 id-ChosenEncryptionAlgorithm 					INTEGER ::= 5
@@ -202,8 +206,8 @@ id-UE-ID 										INTEGER ::= 69
 id-UL-GTP-PDU-SequenceNumber 					INTEGER ::= 70
 id-RAB-FailedtoReportItem						INTEGER ::= 71
 id-RAB-FailedtoReportList 						INTEGER ::= 72
-id-Not-Used-73									INTEGER ::= 73
-id-Not-Used-74									INTEGER ::= 74
+id-Not-Used-73 									INTEGER ::= 73
+id-Not-Used-74 									INTEGER ::= 74
 id-KeyStatus									INTEGER ::= 75
 id-DRX-CycleLengthCoefficient 					INTEGER ::= 76
 id-IuSigConIdList								INTEGER ::= 77
@@ -230,8 +234,8 @@ id-LastKnownServiceArea							INTEGER ::= 97
 id-SRB-TrCH-Mapping								INTEGER ::= 98
 id-InterSystemInformation-TransparentContainer	INTEGER ::= 99
 id-NewBSS-To-OldBSS-Information 						INTEGER ::= 100
-id-Not-Used-101											INTEGER ::= 101
-id-Not-Used-102											INTEGER ::= 102
+id-Not-Used-101 										INTEGER ::= 101
+id-Not-Used-102 										INTEGER ::= 102
 id-SourceRNC-PDCP-context-info							INTEGER ::= 103
 id-InformationTransferID								INTEGER ::= 104
 id-SNA-Access-Information								INTEGER ::= 105
@@ -361,7 +365,7 @@ id-SRVCC-Operation-Possible								INTEGER ::= 228
 id-CSG-Id-List											INTEGER ::= 229
 id-PSRABtobeReplaced									INTEGER ::= 230
 id-E-UTRAN-Service-Handover								INTEGER ::= 231
-id-Not-Used-232											INTEGER ::= 232
+id-Not-Used-232 										INTEGER ::= 232
 id-UE-AggregateMaximumBitRate							INTEGER ::= 233
 id-CSG-Membership-Status 								INTEGER ::= 234
 id-Cell-Access-Mode										INTEGER ::= 235
@@ -375,12 +379,50 @@ id-Correlation-ID										INTEGER ::= 242
 id-IRAT-Measurement-Configuration						INTEGER ::= 243
 id-MDT-Configuration									INTEGER ::= 244
 id-Priority-Class-Indicator								INTEGER ::= 245
-id-Not-Used-246											INTEGER ::= 246
+id-Not-Used-246 										INTEGER ::= 246
 id-RNSAPRelocationParameters							INTEGER ::= 247
 id-RABParametersList									INTEGER ::= 248
 id-Management-Based-MDT-Allowed							INTEGER ::= 249
 id-HigherBitratesThan16MbpsFlag							INTEGER ::= 250
 id-Trace-Collection-Entity-IP-Addess					INTEGER ::= 251
 id-End-Of-CSFB											INTEGER ::= 252
+id-Time-UE-StayedInCell-EnhancedGranularity				INTEGER ::= 253
+id-Out-Of-UTRAN											INTEGER ::= 254
+id-TraceRecordingSessionReference				INTEGER ::= 255
+id-IMSI											INTEGER ::= 256
+id-HO-Cause												INTEGER ::= 257
+id-VoiceSupportMatchIndicator							INTEGER ::= 258
+id-RSRVCC-HO-Indication									INTEGER ::= 259
+id-RSRVCC-Information									INTEGER ::= 260
+id-AnchorPLMN-ID										INTEGER ::= 261
+id-Tunnel-Information-for-BBF							INTEGER ::= 262
+id-Management-Based-MDT-PLMN-List						INTEGER ::= 263
+id-SignallingBasedMDTPLMNList							INTEGER ::= 264
+id-M4Report												INTEGER ::= 265
+id-M5Report												INTEGER ::= 266
+id-M6Report												INTEGER ::= 267
+id-M7Report												INTEGER ::= 268
+id-TimingDifferenceULDL									INTEGER ::= 269
+id-Serving-Cell-Identifier								INTEGER ::= 270
+id-EARFCN-Extended										INTEGER ::= 271
+id-RSRVCC-Operation-Possible							INTEGER ::= 272
+id-SIPTO-LGW-TransportLayerAddress						INTEGER ::= 273
+id-SIPTO-Correlation-ID									INTEGER ::= 274
+id-LHN-ID												INTEGER ::= 275
+id-Session-Re-establishment-Indicator					INTEGER ::= 276
+id-LastE-UTRANPLMNIdentity								INTEGER ::= 277
+id-RSRQ-Type											INTEGER ::= 278
+id-RSRQ-Extension										INTEGER ::= 279
+id-Additional-CSPS-coordination-information				INTEGER ::= 280
+id-UERegistrationQueryResult							INTEGER ::= 281
+id-IuSigConIdRangeEnd									INTEGER ::= 282
+id-BarometricPressure									INTEGER ::= 283
+id-Additional-PositioningDataSet 						INTEGER ::= 284
+id-CivicAddress											INTEGER ::= 285
+id-SGSN-Group-Identity									INTEGER ::= 286
+id-P-TMSI												INTEGER ::= 287
+id-RANAP-Message										INTEGER ::= 288
+id-PowerSavingIndicator									INTEGER ::= 289
+id-UE-Usage-Type										INTEGER ::= 290
 
 END
diff --git a/epan/dissectors/asn1/ranap/RANAP-Containers.asn b/epan/dissectors/asn1/ranap/RANAP-Containers.asn
index d88e0781fa..9a7881bbbc 100644
--- a/epan/dissectors/asn1/ranap/RANAP-Containers.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-Containers.asn
@@ -1,6 +1,6 @@
 -- RANAP-Containers.asn
 --
--- 3GPP TS 25.413 V10.4.0 (2011-12)
+-- 3GPP TS 25.413 V13.2.0 (2016-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.7	Container Definitions
diff --git a/epan/dissectors/asn1/ranap/RANAP-IEs.asn b/epan/dissectors/asn1/ranap/RANAP-IEs.asn
index 0007063730..f60d02da0b 100644
--- a/epan/dissectors/asn1/ranap/RANAP-IEs.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-IEs.asn
@@ -1,6 +1,6 @@
 -- RANAP-IEs.asn
 --
--- 3GPP TS 25.413 V10.4.0 (2011-12)
+-- 3GPP TS 25.413 V13.2.0 (2016-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.4	Information Element Definitions
@@ -50,6 +50,9 @@ IMPORTS
 	maxNrOfRAIs,
 	maxNrOfLAIs,
 	maxNrOfVol,
+	maxSizeOfIMSInfo,
+	maxnoofMDTPLMNs,
+	maxAddPosSet,
 
 	id-CN-DomainIndicator,
 	id-MessageStructure,
@@ -93,7 +96,25 @@ IMPORTS
 	id-CSG-Id,
 	id-CSFB-Information,
 	id-IRAT-Measurement-Configuration,
-	id-Management-Based-MDT-Allowed
+	id-Management-Based-MDT-Allowed,
+	id-Time-UE-StayedInCell-EnhancedGranularity,
+	id-HO-Cause,
+	id-TraceRecordingSessionReference,
+	id-IMSI,
+	id-Management-Based-MDT-PLMN-List,
+	id-SignallingBasedMDTPLMNList,
+	id-M4Report,
+	id-M5Report,
+	id-M6Report,
+	id-M7Report,
+	id-TimingDifferenceULDL,
+	id-Trace-Collection-Entity-IP-Addess,
+	id-Serving-Cell-Identifier,
+	id-EARFCN-Extended,
+	id-LastE-UTRANPLMNIdentity,
+	id-RSRQ-Type,
+	id-RSRQ-Extension,
+	id-Additional-PositioningDataSet
 
 
 FROM RANAP-Constants
@@ -116,6 +137,23 @@ AccuracyFulfilmentIndicator ::= ENUMERATED{
 	...
 }
 
+Additional-CSPS-coordination-information ::= SEQUENCE {
+	old-LAI					LAI							OPTIONAL,
+	old-RAC					RAC							OPTIONAL,
+	nRI						BIT STRING (SIZE (10))		OPTIONAL,
+	uE-is-Attaching			NULL						OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { {Additional-CSPS-coordination-information-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-CSPS-coordination-information-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-PositioningDataSet ::= SEQUENCE(SIZE(1..maxAddPosSet)) OF Additional-PositioningMethodAndUsage
+
+Additional-PositioningMethodAndUsage ::= OCTET STRING (SIZE(1))
+
 AllocationOrRetentionPriority ::= SEQUENCE {
 	priorityLevel			PriorityLevel,
 	pre-emptionCapability		Pre-emptionCapability,
@@ -307,6 +345,8 @@ AuthorisedSNAs ::= SEQUENCE (SIZE (1..maxNrOfSNAs)) OF SNAC
 
 -- B
 
+BarometricPressure ::= INTEGER (30000..115000)
+
 BindingID				::= OCTET STRING (SIZE (4))
 
 BroadcastAssistanceDataDecipheringKeys	::= SEQUENCE {
@@ -499,6 +539,8 @@ CellType ::= ENUMERATED{
 	...
 }
 
+CivicAddress ::= OCTET STRING
+
 ClientType ::= ENUMERATED {
 	emergency-Services,
 	value-Added-Services,
@@ -668,6 +710,8 @@ DSCH-ID ::= INTEGER (0..255)
 
 -- E
 
+EARFCN-Extended		::= INTEGER (65536..262143, ...)
+
 E-DCH-MAC-d-Flow-ID		::= INTEGER (0.. maxNrOfEDCHMACdFlows-1)
 
 ENB-ID ::= CHOICE {
@@ -955,6 +999,19 @@ ImmediateMDT	::= SEQUENCE {
 	-- Included in case of event-triggered reporting for measurement M1
 	m2report					M2Report				OPTIONAL,
 	-- Included in case of event-triggered reporting for measurement M2
+	...,
+	iE-Extensions		ProtocolExtensionContainer { { ImmediateMDT-ExtIEs} } OPTIONAL
+}
+
+ImmediateMDT-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	{ID id-M4Report		CRITICALITY ignore	EXTENSION M4Report		PRESENCE optional}|
+	-- Included in case that measurement M4 is activated
+	{ID id-M5Report		CRITICALITY ignore	EXTENSION M5Report		PRESENCE optional}|
+	-- Included in case that measurement M5 is activated
+	{ID id-M6Report		CRITICALITY ignore	EXTENSION M6Report		PRESENCE optional}|
+	-- Included in case that measurement M6 is activated
+	{ID id-M7Report		CRITICALITY ignore	EXTENSION M7Report		PRESENCE optional},
+	-- Included in case that measurement M7 is activated
 	...
 }
 
@@ -1091,9 +1148,16 @@ LastVisitedUTRANCell-Item ::= SEQUENCE {
 }
 
 LastVisitedUTRANCell-Item-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Rel-11 to support enhanced granularity for time UE stayed in cell --
+	{ ID id-Time-UE-StayedInCell-EnhancedGranularity	CRITICALITY ignore	EXTENSION Time-UE-StayedInCell-EnhancedGranularity		PRESENCE	optional }|
+	{ ID id-HO-Cause									CRITICALITY ignore	EXTENSION Cause														PRESENCE	optional },
 	...
 }
 
+LHN-ID ::= OCTET STRING (SIZE (32..256))
+
+Links-to-log ::= ENUMERATED {uplink, downlink, both-uplink-and-downlink, ...}
+
 ListOF-SNAs ::= SEQUENCE (SIZE (1..maxNrOfSNAs)) OF SNAC
 
 ListOfInterfacesToTrace ::= SEQUENCE (SIZE (1..maxNrOfInterfaces)) OF InterfacesToTraceItem
@@ -1113,8 +1177,8 @@ LoadValue	::= INTEGER (0..100)
 LocationRelatedDataRequestType	::= SEQUENCE {
 	requestedLocationRelatedDataType			RequestedLocationRelatedDataType,
 	requestedGPSAssistanceData					RequestedGPSAssistanceData	OPTIONAL,
-	-- This IE shall be present if the Requested Location Related Data Type IE is set to 'Dedicated Assistance Data for Assisted GPS' or
-	-- `Dedicated Assistance Data for Assisted GPS and GANSS'
+	-- This IE shall be present if the Requested Location Related Data Type IE is set to ‘Dedicated Assistance Data for Assisted GPS’ or
+	-- `Dedicated Assistance Data for Assisted GPS and GANSS’
 	...
 }
 
@@ -1178,6 +1242,64 @@ M2Report	::= CHOICE {
 	...
 }
 
+M4Report	::= CHOICE {
+	all							NULL,
+	m4-collection-parameters	M4-Collection-Parameters,
+	...
+}
+
+M4-Collection-Parameters ::= SEQUENCE {
+	m4-period		M4-Period,
+	m4-threshold	M4-Threshold	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { { M4-Collection-Parameters-ExtIEs} } OPTIONAL,
+	...
+}
+
+M4-Collection-Parameters-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+M4-Period  ::= ENUMERATED {ms100, ms250, ms500, ms1000, ms2000, ms3000, ms4000, ms6000, ...}
+
+
+M4-Threshold ::= INTEGER (0..31)
+
+
+M5Report	::= CHOICE {
+	when-available		NULL,
+	m5-period			M5-Period,
+	...
+}
+M5-Period ::= ENUMERATED {ms100, ms250, ms500, ms1000, ms2000, ms3000, ms4000, ms6000, ...}
+
+
+
+M6Report ::= SEQUENCE {
+	m6-period			M6-Period,
+	m6-links-to-log		Links-to-log,
+	iE-Extensions		ProtocolExtensionContainer { { M6Report-ExtIEs} } OPTIONAL,
+	...
+}
+
+M6Report-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+M6-Period ::= ENUMERATED {ms1000, ms2000, ms3000, ms4000, ms6000, ms8000, ms12000, ms16000, ms20000, ms24000, ms28000, ms32000, ms64000, ...}
+
+M7Report ::= SEQUENCE {
+	m7-period			M7-Period,
+	m7-links-to-log		Links-to-log,
+	iE-Extensions		ProtocolExtensionContainer { { M7Report-ExtIEs} } OPTIONAL,
+	...
+}
+
+M7Report-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+M7-Period ::= ENUMERATED {ms1000, ms2000, ms3000, ms4000, ms6000, ms8000, ms12000, ms16000, ms20000, ms24000, ms28000, ms32000, ms64000, ...}
+
 Management-Based-MDT-Allowed ::= ENUMERATED {
 	allowed, ... }
 
@@ -1261,22 +1383,26 @@ MDT-Configuration	::= SEQUENCE {
 }
 
 MDT-Configuration-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-SignallingBasedMDTPLMNList				CRITICALITY ignore	EXTENSION MDT-PLMN-List		PRESENCE optional },
 ...
 }
 
-MDTMode				::= CHOICE {
+MDTMode ::= CHOICE {
 	immediateMDT		ImmediateMDT,
 	loggedMDT			LoggedMDT,
 	...
 }
 
-MDT-Report-Parameters	::=	SEQUENCE {
+MDT-PLMN-List ::= SEQUENCE (SIZE (1..maxnoofMDTPLMNs)) OF
+	PLMNidentity
+
+MDT-Report-Parameters ::= SEQUENCE {
 	reportInterval			ReportInterval,
 	reportAmount			ReportAmount,
 	...
 }
 
-MeasurementQuantity		::= ENUMERATED {
+MeasurementQuantity ::= ENUMERATED {
 		cpichEcNo,
 		cpichRSCP,
 		pathloss,
@@ -1290,25 +1416,27 @@ MSISDN ::= OCTET STRING (SIZE (1..9))
 -- N
 
 
-NAS-PDU					::= OCTET STRING
+NAS-PDU ::= OCTET STRING
 
-NAS-SequenceNumber			::= BIT STRING (SIZE (2))
+NAS-SequenceNumber ::= BIT STRING (SIZE (2))
 -- Reference: 24.008
 
-NAS-SynchronisationIndicator	::= BIT STRING (SIZE (4))
+NAS-SynchronisationIndicator ::= BIT STRING (SIZE (4))
 
-NewBSS-To-OldBSS-Information		::= OCTET STRING
+NewBSS-To-OldBSS-Information ::= OCTET STRING
 
 NonSearchingIndication ::= ENUMERATED {
 	non-searching,
 	searching
 }
 
-NRTLoadInformationValue	::= INTEGER (0..3)
+NRTLoadInformationValue ::= INTEGER (0..3)
 
-NumberOfIuInstances			::= INTEGER (1..2)
+Null-NRI ::= BIT STRING (SIZE (10))
 
-NumberOfSteps				::= INTEGER (1..16)
+NumberOfIuInstances ::= INTEGER (1..2)
+
+NumberOfSteps ::= INTEGER (1..16)
 
 -- O
 
@@ -1327,11 +1455,16 @@ Offload-RAB-Parameters-APN ::= OCTET STRING (SIZE (1..255))
 
 Offload-RAB-Parameters-ChargingCharacteristics ::= OCTET STRING (SIZE (2))
 
-OldBSS-ToNewBSS-Information		::= OCTET STRING
+OldBSS-ToNewBSS-Information ::= OCTET STRING
 
 OMC-ID					::= OCTET STRING (SIZE (3..22))
 -- Reference: GSM TS 12.20 [25]
 
+Out-Of-UTRAN ::= ENUMERATED{
+	cell-reselection-to-EUTRAN,
+	...
+}
+
 -- P
 
 PagingAreaID ::= CHOICE {
@@ -1458,6 +1591,8 @@ PLMNs-in-shared-network-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Port-Number ::= OCTET STRING (SIZE (2))
+
 PositioningDataDiscriminator ::= BIT STRING (SIZE(4))
 
 PositioningDataSet ::= SEQUENCE(SIZE(1..maxSet)) OF PositioningMethodAndUsage
@@ -1479,7 +1614,8 @@ PositionData ::= SEQUENCE {
 }
 
 PositionData-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-GANSS-PositioningDataSet			CRITICALITY ignore	EXTENSION GANSS-PositioningDataSet				PRESENCE optional },
+	{ ID id-GANSS-PositioningDataSet			CRITICALITY ignore	EXTENSION GANSS-PositioningDataSet				PRESENCE optional}|
+	{ ID id-Additional-PositioningDataSet		CRITICALITY ignore	EXTENSION Additional-PositioningDataSet		PRESENCE optional},
 	...
 }
 
@@ -1504,6 +1640,12 @@ ProvidedData ::= CHOICE {
 	...
 }
 
+PowerSavingIndicator ::= ENUMERATED {
+	psmConfigured,
+	eDRXConfigured,
+	...
+}
+
 P-TMSI					::= OCTET STRING (SIZE (4))
 
 -- Q
@@ -1688,7 +1830,9 @@ RejectCauseValue ::= ENUMERATED {
 	no-Suitable-Cell-In-Location-Area,
 	gPRS-Services-Not-Allowed-In-This-PLMN,
 	cS-PS-coordination-required,
-	...
+	...,
+	network-failure,
+	not-authorized-for-this-CSG
 }
 
 
@@ -1730,7 +1874,10 @@ ReportInterval		::=	ENUMERATED {
 						ms24000,
 						ms32000,
 						ms64000,
-						... }
+						...,
+						ms8000,
+						ms28000
+}
 
 ReportAmount		::=	ENUMERATED { n1, n2, n4, n8, n16, n32, n64, infinity, ... }
 
@@ -1859,6 +2006,11 @@ RNCTraceInformation::= SEQUENCE {
 }
 
 RNCTraceInformation-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Release 11 to enable anonymization MDT for area based MDT --
+	{ID id-TraceRecordingSessionReference		CRITICALITY ignore	EXTENSION TraceRecordingSessionReference	PRESENCE optional}|
+	{ID id-IMSI									CRITICALITY ignore	EXTENSION IMSI									PRESENCE optional}|
+	{ID id-Trace-Collection-Entity-IP-Addess	CRITICALITY ignore	EXTENSION TransportLayerAddress				PRESENCE optional}|
+	{ID id-Serving-Cell-Identifier				CRITICALITY ignore	EXTENSION UTRAN-CellID							PRESENCE optional},
 	...
 }
 
@@ -1879,6 +2031,28 @@ RRC-Container				::= OCTET STRING
 
 RTLoadValue	::= INTEGER (0..100)
 
+RSRVCC-HO-Indication ::= ENUMERATED {
+	ps-only,
+	...
+}
+
+RSRVCC-Information ::= SEQUENCE {
+	nonce					BIT STRING (SIZE (128)),
+	iMSInformation			OCTET STRING(SIZE(1.. maxSizeOfIMSInfo)),
+	iE-Extensions			ProtocolExtensionContainer { { RSRVCC-Information-ExtIEs} } OPTIONAL,
+	...
+
+}
+
+RSRVCC-Information-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+RSRVCC-Operation-Possible ::= ENUMERATED {
+	rsrvcc-possible,
+	...
+}
+
 -- S
 
 SAC					::= OCTET STRING (SIZE (2))
@@ -1906,6 +2080,8 @@ Shared-Network-Information ::= SEQUENCE {
 		...
 	}
 
+Session-Re-establishment-Indicator	::= ENUMERATED {true, ...}
+
 Shared-Network-Information-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
@@ -1952,6 +2128,13 @@ SDU-Parameters-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+SGSN-Group-Identity ::= CHOICE {
+	null-NRI				Null-NRI,
+	sGSN-Group-ID			SGSN-Group-ID
+}
+
+SGSN-Group-ID ::= OCTET STRING (SIZE (2))
+
 SNA-Access-Information ::= SEQUENCE {
 		authorisedPLMNs			AuthorisedPLMNs,
 		iE-Extensions			ProtocolExtensionContainer { {SNA-Access-Information-ExtIEs} } OPTIONAL,
@@ -2046,7 +2229,11 @@ SourceRNC-ToTargetRNC-TransparentContainer-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 10 to indicate to the Target RNC the need of continued IRAT measurement --
 	{ID id-IRAT-Measurement-Configuration		CRITICALITY ignore	EXTENSION IRAT-Measurement-Configuration		PRESENCE optional}|
 -- Extension for Release 10 to indicate Management Based MDT Allowed --
-	{ID id-Management-Based-MDT-Allowed			CRITICALITY ignore	EXTENSION Management-Based-MDT-Allowed			PRESENCE optional},
+	{ID id-Management-Based-MDT-Allowed			CRITICALITY ignore	EXTENSION Management-Based-MDT-Allowed			PRESENCE optional}|
+-- Extension for Release 11 to indicate Management Based MDT PLMN List --
+	{ID id-Management-Based-MDT-PLMN-List		CRITICALITY ignore	EXTENSION MDT-PLMN-List								PRESENCE optional}|
+-- Extension for Release 11 to indicate the last E-UTRAN PLMN Identity --
+	{ID id-LastE-UTRANPLMNIdentity				CRITICALITY ignore	EXTENSION PLMNidentity								PRESENCE optional},
 	...
 }
 
@@ -2057,6 +2244,8 @@ IRAT-Measurement-Configuration ::= SEQUENCE {
 	iE-Extensions				ProtocolExtensionContainer { {IRAT-Measurement-Configuration-ExtIEs} } OPTIONAL}
 
 IRAT-Measurement-Configuration-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	{ID id-RSRQ-Type						CRITICALITY ignore	EXTENSION RSRQ-Type						PRESENCE optional}|
+	{ID id-RSRQ-Extension					CRITICALITY ignore	EXTENSION RSRQ-Extension				PRESENCE optional},
 	...
 }
 
@@ -2069,6 +2258,13 @@ IRATmeasurementParameters-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+RSRQ-Type ::= SEQUENCE {
+	allSymbols							BOOLEAN,
+	wideBand							BOOLEAN
+}
+
+RSRQ-Extension ::= INTEGER (-30..46, ...)
+
 EUTRANFrequencies ::= SEQUENCE (SIZE (1..maxNrOfEUTRAFreqs)) OF SEQUENCE {
 	earfcn					INTEGER (0..65535),
 	measBand				MeasBand			OPTIONAL,
@@ -2084,6 +2280,7 @@ MeasBand ::= ENUMERATED {
 }
 
 EUTRANFrequencies-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-EARFCN-Extended			CRITICALITY reject	EXTENSION EARFCN-Extended		PRESENCE optional},
 	...
 }
 
@@ -2234,8 +2431,11 @@ TemporaryUE-ID ::= CHOICE {
 
 Time-UE-StayedInCell ::= INTEGER (0..4095)
 
+Time-UE-StayedInCell-EnhancedGranularity ::= INTEGER (0..40950)
+
 TimeToMBMSDataTransfer		::= OCTET STRING(SIZE(1))
 
+TimingDifferenceULDL	::= OCTET STRING (SIZE(1))
 
 TMGI ::= SEQUENCE {
 	pLMNidentity			PLMNidentity,
@@ -2336,6 +2536,18 @@ TrCH-ID-List ::= SEQUENCE (SIZE (1..maxRAB-Subflows)) OF
 
 TriggerID				::= OCTET STRING (SIZE (3..22))
 
+TunnelInformation ::= SEQUENCE {
+	transportLayerAddress	TransportLayerAddress,
+	uDP-Port-Number			Port-Number				OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { {Tunnel-Information-ExtIEs} } OPTIONAL,
+	...
+}
+
+Tunnel-Information-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 TypeOfError ::= ENUMERATED {
 	not-understood,
 	missing,
@@ -2368,6 +2580,35 @@ UE-ID ::= CHOICE {
 
 }
 
+UE-IsNotServed::= SEQUENCE {
+	permanentNAS-UE-ID		PermanentNAS-UE-ID,
+	iE-Extensions			ProtocolExtensionContainer { { UE-IsNotServed-ExtIEs } }		OPTIONAL,
+	...
+}
+
+UE-IsNotServed-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+UE-IsServed::= SEQUENCE {
+	permanentNAS-UE-ID		PermanentNAS-UE-ID,
+	pLMNidentity			PLMNidentity,
+	iE-Extensions			ProtocolExtensionContainer { { UE-IsServed-ExtIEs } }		OPTIONAL,
+	...
+}
+
+UE-IsServed-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+UE-Usage-Type ::= INTEGER (0..255)
+
+UERegistrationQueryResult ::= CHOICE {
+	uE-IsServed			UE-IsServed,
+	uE-IsNotServed		UE-IsNotServed
+}
+
 UESBI-Iu ::= SEQUENCE {
 	uESBI-IuA		UESBI-IuA	OPTIONAL,
 	uESBI-IuB		UESBI-IuB	OPTIONAL,
@@ -2400,6 +2641,8 @@ UPInformation		::=		SEQUENCE {
 }
 
 UPInformation-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	{ID id-TimingDifferenceULDL		CRITICALITY ignore	EXTENSION TimingDifferenceULDL		PRESENCE optional},
+
 	...
 }
 
@@ -2499,4 +2742,10 @@ VerticalSpeedDirection ::= ENUMERATED {
 
 VerticalAccuracyCode			::= INTEGER (0..127)
 
+VoiceSupportMatchIndicator ::= ENUMERATED {
+	supported,
+	not-supported,
+	...
+}
+
 END
diff --git a/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn b/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn
index 2b08a9606a..4301328952 100644
--- a/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Contents.asn
 --
--- 3GPP TS 25.413 V10.4.0 (2011-12)
+-- 3GPP TS 25.413 V13.2.0 (2016-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.3	PDU Definitions
@@ -113,6 +113,7 @@ IMPORTS
 	PositionDataSpecificToGERANIuMode,
 	PositioningPriority,
 	ProvidedData,
+	PowerSavingIndicator,
 	RAB-ID,
 	RAB-Parameters,
 	RAC,
@@ -127,6 +128,9 @@ IMPORTS
 	Requested-RAB-Parameter-Values,
 	ResponseTime,
 	RRC-Container,
+	RSRVCC-Operation-Possible,
+	RSRQ-Type,
+	RSRQ-Extension,
 	SAI,
 	SAPI,
 	Service-Handover,
@@ -161,6 +165,7 @@ IMPORTS
 	UserPlaneMode,
 	VelocityEstimate,
 	VerticalAccuracyCode,
+	VoiceSupportMatchIndicator,
 	Alt-RAB-Parameters,
 	Ass-RAB-Parameters,
 	PeriodicLocationInfo,
@@ -171,7 +176,21 @@ IMPORTS
 	Priority-Class-Indicator,
 	Management-Based-MDT-Allowed,
 	HigherBitratesThan16MbpsFlag,
-	End-Of-CSFB
+	End-Of-CSFB,
+	Out-Of-UTRAN,
+	RSRVCC-HO-Indication,
+	RSRVCC-Information,
+	MDT-PLMN-List,
+	TunnelInformation,
+	LHN-ID,
+	Session-Re-establishment-Indicator,
+	Additional-CSPS-coordination-information,
+	UERegistrationQueryResult,
+	SGSN-Group-Identity,
+	P-TMSI,
+	BarometricPressure,
+	CivicAddress,
+	UE-Usage-Type
 
 FROM RANAP-IEs
 
@@ -352,6 +371,7 @@ FROM RANAP-Containers
 	id-RequestedGANSSAssistanceData,
 	id-RequestType,
 	id-ResponseTime,
+	id-RSRVCC-Operation-Possible,
 	id-SAI,
 	id-SAPI,
 	id-SelectedPLMN-ID,
@@ -385,6 +405,7 @@ FROM RANAP-Containers
 	id-UnsuccessfulLinkingList,
 	id-VelocityEstimate,
 	id-VerticalAccuracyCode,
+	id-VoiceSupportMatchIndicator,
 	id-PeriodicLocationInfo,
 	id-BroadcastGANSSAssistanceDataDecipheringKeys,
 	id-SubscriberProfileIDforRFP,
@@ -399,7 +420,28 @@ FROM RANAP-Containers
 	id-Management-Based-MDT-Allowed,
 	id-HigherBitratesThan16MbpsFlag,
 	id-Trace-Collection-Entity-IP-Addess,
-	id-End-Of-CSFB
+	id-End-Of-CSFB,
+	id-Out-Of-UTRAN,
+	id-RSRVCC-HO-Indication,
+	id-RSRVCC-Information,
+	id-AnchorPLMN-ID,
+	id-Management-Based-MDT-PLMN-List,
+	id-Tunnel-Information-for-BBF,
+	id-SIPTO-Correlation-ID,
+	id-SIPTO-LGW-TransportLayerAddress,
+	id-LHN-ID,
+	id-LastE-UTRANPLMNIdentity,
+	id-Session-Re-establishment-Indicator,
+	id-Additional-CSPS-coordination-information,
+	id-UERegistrationQueryResult,
+	id-IuSigConIdRangeEnd,
+	id-SGSN-Group-Identity,
+	id-P-TMSI,
+	id-RANAP-Message,
+	id-PowerSavingIndicator,
+	id-BarometricPressure,
+	id-CivicAddress,
+	id-UE-Usage-Type
 
 FROM RANAP-Constants;
 
@@ -439,7 +481,9 @@ Iu-ReleaseCommandIEs RANAP-PROTOCOL-IES ::= {
 }
 
 Iu-ReleaseCommandExtensions RANAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-End-Of-CSFB				CRITICALITY ignore	EXTENSION End-Of-CSFB		PRESENCE optional	},
+	{ ID id-End-Of-CSFB				CRITICALITY ignore	EXTENSION End-Of-CSFB		PRESENCE optional }|
+	{ ID id-Out-Of-UTRAN			CRITICALITY ignore	EXTENSION Out-Of-UTRAN		PRESENCE optional }|
+	{ ID id-LastE-UTRANPLMNIdentity	CRITICALITY ignore	EXTENSION PLMNidentity		PRESENCE optional },
 	...
 }
 
@@ -541,15 +585,17 @@ RelocationRequiredIEs RANAP-PROTOCOL-IES ::= {
 
 RelocationRequiredExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 5 to enable GERAN support over Iu-cs --
-	{ ID id-GERAN-Classmark					CRITICALITY ignore	EXTENSION GERAN-Classmark			PRESENCE optional	} |
+	{ ID id-GERAN-Classmark								CRITICALITY ignore	EXTENSION GERAN-Classmark										PRESENCE optional} |
 -- Extension for Release 6 to enable Inter-RAT PS Handover between UTRAN and GERAN A/Gb --
-	{ ID id-SourceBSS-ToTargetBSS-TransparentContainer		CRITICALITY	ignore	EXTENSION SourceBSS-ToTargetBSS-TransparentContainer		PRESENCE optional	}|
+	{ ID id-SourceBSS-ToTargetBSS-TransparentContainer	CRITICALITY ignore	EXTENSION SourceBSS-ToTargetBSS-TransparentContainer	PRESENCE optional} |
 -- Extension for Release 8 for SRVCC operation --
-	{ ID id-SRVCC-HO-Indication					CRITICALITY reject	EXTENSION SRVCC-HO-Indication			PRESENCE optional	} |
+	{ ID id-SRVCC-HO-Indication							CRITICALITY reject	EXTENSION SRVCC-HO-Indication									PRESENCE optional} |
 -- Extension for Release 9 to communicate to the CN the CSG id of the target cell --
-	{ ID id-CSG-Id 								CRITICALITY reject 	EXTENSION CSG-Id 										PRESENCE optional} |
+	{ ID id-CSG-Id										CRITICALITY reject	EXTENSION CSG-Id 													PRESENCE optional} |
 -- Extension for Release 9 to communicate to the CN the hybrid access status of the target cell --
-	{ ID id-Cell-Access-Mode				CRITICALITY reject	EXTENSION Cell-Access-Mode						PRESENCE optional},
+	{ ID id-Cell-Access-Mode							CRITICALITY reject	EXTENSION Cell-Access-Mode										PRESENCE optional} |
+-- Extension for Release 11 for rSRVCC operation --
+	{ ID id-RSRVCC-HO-Indication						CRITICALITY reject	EXTENSION RSRVCC-HO-Indication									PRESENCE optional},
 	...
 }
 
@@ -616,11 +662,13 @@ RAB-DataForwardingItem-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 RelocationCommandExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 5 to enable Inter RAN Load Information Exchange over Iu --
-	{ ID id-InterSystemInformation-TransparentContainer		CRITICALITY ignore	EXTENSION InterSystemInformation-TransparentContainer					PRESENCE optional	} |
+	{ ID id-InterSystemInformation-TransparentContainer	CRITICALITY ignore	EXTENSION InterSystemInformation-TransparentContainer	PRESENCE optional} |
 -- Extension for Release 6 to enable Inter-RAT PS Handover between UTRAN and GERAN A/Gb --
-	{ ID id-TargetBSS-ToSourceBSS-TransparentContainer		CRITICALITY	ignore	EXTENSION TargetBSS-ToSourceBSS-TransparentContainer		PRESENCE optional	}|
+	{ ID id-TargetBSS-ToSourceBSS-TransparentContainer	CRITICALITY ignore	EXTENSION TargetBSS-ToSourceBSS-TransparentContainer	PRESENCE optional} |
 -- Extension for Release 8 for SRVCC operation --
-	{ ID id-SRVCC-Information					CRITICALITY reject	EXTENSION SRVCC-Information			PRESENCE optional	},
+	{ ID id-SRVCC-Information							CRITICALITY reject	EXTENSION SRVCC-Information										PRESENCE optional} |
+-- Extension for Release 11 for rSRVCC operation --
+	{ ID id-RSRVCC-Information							CRITICALITY reject	EXTENSION RSRVCC-Information									PRESENCE optional},
 	...
 }
 
@@ -744,7 +792,10 @@ RelocationRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 9 for enabling UE prioritisation during access to hybrid cells --
 	{ ID id-CSG-Membership-Status			CRITICALITY ignore	EXTENSION CSG-Membership-Status			PRESENCE optional}|
 -- Extension for Release 10 to enable offload at Iu-PS for UTRAN --
-	{ ID id-MSISDN							CRITICALITY ignore	EXTENSION MSISDN						PRESENCE optional},
+	{ ID id-MSISDN							CRITICALITY ignore	EXTENSION MSISDN						PRESENCE optional}|
+-- Extension for Release 11 to support rSRVCC in case of network sharing –
+	{ ID id-AnchorPLMN-ID					CRITICALITY ignore	EXTENSION PLMNidentity					PRESENCE optional}|
+	{ ID id-PowerSavingIndicator			CRITICALITY ignore	EXTENSION PowerSavingIndicator			PRESENCE optional},
 	...
 }
 
@@ -1286,6 +1337,7 @@ ResetResourceItem ::= SEQUENCE {
 }
 
 ResetResourceItem-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-IuSigConIdRangeEnd		CRITICALITY reject	EXTENSION IuSignallingConnectionIdentifier	PRESENCE optional},
 	...
 }
 
@@ -1330,6 +1382,7 @@ ResetResourceAckItem ::= SEQUENCE {
 }
 
 ResetResourceAckItem-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-IuSigConIdRangeEnd	CRITICALITY ignore	EXTENSION IuSignallingConnectionIdentifier		PRESENCE optional},
 	...
 }
 
@@ -1463,7 +1516,11 @@ RelocationCompleteIEs RANAP-PROTOCOL-IES ::= {
 
 RelocationCompleteExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 9 to enable the CN to handle potential UE NAS QoS issues related to higher bitrates --
-	{ ID id-HigherBitratesThan16MbpsFlag		CRITICALITY ignore	EXTENSION HigherBitratesThan16MbpsFlag		PRESENCE optional },
+	{ ID id-HigherBitratesThan16MbpsFlag		CRITICALITY ignore	EXTENSION HigherBitratesThan16MbpsFlag		PRESENCE optional}|
+-- Extension for Release 11 to support BBAI --
+	{ ID id-Tunnel-Information-for-BBF			CRITICALITY ignore	EXTENSION TunnelInformation						PRESENCE optional}|
+-- Extension for Release 12 to support SIPTO@LN Stand-Alone --
+	{ ID id-LHN-ID								CRITICALITY ignore	EXTENSION LHN-ID								PRESENCE optional},
 	...
 }
 
@@ -1486,14 +1543,14 @@ EnhancedRelocationCompleteRequest ::= SEQUENCE {
 }
 
 EnhancedRelocationCompleteRequestIEs RANAP-PROTOCOL-IES ::= {
-	{ ID id-OldIuSigConId	CRITICALITY reject TYPE IuSignallingConnectionIdentifier	PRESENCE mandatory } |
-	{ ID id-IuSigConId	CRITICALITY reject TYPE IuSignallingConnectionIdentifier	PRESENCE mandatory } |
-	{ ID id-Relocation-SourceRNC-ID				CRITICALITY ignore	TYPE	GlobalRNC-ID				PRESENCE mandatory } |
-	{ ID id-Relocation-SourceExtendedRNC-ID			CRITICALITY ignore		TYPE ExtendedRNC-ID			PRESENCE optional	} |
-	{ ID id-Relocation-TargetRNC-ID				CRITICALITY reject	TYPE GlobalRNC-ID	 				PRESENCE mandatory	} |
-	{ ID id-Relocation-TargetExtendedRNC-ID			CRITICALITY reject		TYPE ExtendedRNC-ID			PRESENCE optional	} |
-	{ ID id-RAB-SetupList-EnhancedRelocCompleteReq			CRITICALITY reject	TYPE RAB-SetupList-EnhancedRelocCompleteReq	PRESENCE optional	}
-,	...
+	{ ID id-OldIuSigConId							CRITICALITY reject	TYPE IuSignallingConnectionIdentifier				PRESENCE mandatory } |
+	{ ID id-IuSigConId								CRITICALITY reject	TYPE IuSignallingConnectionIdentifier				PRESENCE mandatory } |
+	{ ID id-Relocation-SourceRNC-ID					CRITICALITY ignore	TYPE GlobalRNC-ID										PRESENCE mandatory } |
+	{ ID id-Relocation-SourceExtendedRNC-ID			CRITICALITY ignore	TYPE ExtendedRNC-ID										PRESENCE optional } |
+	{ ID id-Relocation-TargetRNC-ID					CRITICALITY reject	TYPE GlobalRNC-ID										PRESENCE mandatory } |
+	{ ID id-Relocation-TargetExtendedRNC-ID			CRITICALITY reject	TYPE ExtendedRNC-ID										PRESENCE optional } |
+	{ ID id-RAB-SetupList-EnhancedRelocCompleteReq	CRITICALITY reject	TYPE RAB-SetupList-EnhancedRelocCompleteReq		PRESENCE optional },
+	...
 }
 
 RAB-SetupList-EnhancedRelocCompleteReq 				::= RAB-IE-ContainerList { { RAB-SetupItem-EnhancedRelocCompleteReq-IEs} }
@@ -1520,7 +1577,14 @@ EnhancedRelocationCompleteRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-ChosenIntegrityProtectionAlgorithm	CRITICALITY ignore	EXTENSION ChosenIntegrityProtectionAlgorithm		PRESENCE optional}|
 	{ ID id-ChosenEncryptionAlgorithm			CRITICALITY ignore	EXTENSION ChosenEncryptionAlgorithm					PRESENCE optional}|
 -- Extension for Release 9 to enable the CN to handle potential UE NAS QoS issues related to higher bitrates --
-	{ ID id-HigherBitratesThan16MbpsFlag		CRITICALITY ignore	EXTENSION HigherBitratesThan16MbpsFlag				PRESENCE optional},
+	{ ID id-HigherBitratesThan16MbpsFlag		CRITICALITY ignore	EXTENSION HigherBitratesThan16MbpsFlag				PRESENCE optional}|
+-- Extensions for Release 11 to enable enhanced relocation from RNC to hybrid cell –
+	{ ID id-CSG-Id								CRITICALITY reject	EXTENSION CSG-Id										PRESENCE optional}|
+	{ ID id-Cell-Access-Mode					CRITICALITY reject	EXTENSION Cell-Access-Mode								PRESENCE optional}|
+-- Extension for Release 11 to support BBAI --
+	{ ID id-Tunnel-Information-for-BBF			CRITICALITY ignore	EXTENSION TunnelInformation								PRESENCE optional}|
+-- Extension for Release 12 to support SIPTO@LN Stand-Alone --
+	{ ID id-LHN-ID								CRITICALITY ignore	EXTENSION LHN-ID										PRESENCE optional},
 	...
 }
 
@@ -1588,7 +1652,9 @@ RAB-ToBeReleasedItem-EnhancedRelocCompleteRes-ExtIEs RANAP-PROTOCOL-EXTENSION ::
 EnhancedRelocationCompleteResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-UE-AggregateMaximumBitRate		CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate	PRESENCE optional}|
 -- Extension for Release 10 to enable Offload at Iu-ps for UTRAN --
-	{ ID id-MSISDN							CRITICALITY ignore	EXTENSION MSISDN						PRESENCE optional},
+	{ ID id-MSISDN							CRITICALITY ignore	EXTENSION MSISDN						PRESENCE optional}|
+-- Extension for Release 11 to enable ehnahced relocation from RNC to hybrid cell –
+	{ ID id-CSG-Membership-Status			CRITICALITY ignore	EXTENSION CSG-Membership-Status			PRESENCE optional},
 	...
 }
 
@@ -1710,7 +1776,14 @@ CommonIDExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 9 to allow for UE prioritisation during access to hybrid cells --
 	{ ID id-CSG-Membership-Status			CRITICALITY ignore	EXTENSION CSG-Membership-Status					PRESENCE optional }|
 -- Extension for Release 10 to indicate Management Based MDT Allowed --
-	{ ID id-Management-Based-MDT-Allowed	CRITICALITY ignore	EXTENSION Management-Based-MDT-Allowed		PRESENCE optional},
+	{ ID id-Management-Based-MDT-Allowed	CRITICALITY ignore	EXTENSION Management-Based-MDT-Allowed		PRESENCE optional }|
+-- Extension for Release 11 to indicate MDT PLMN List --
+	{ ID id-Management-Based-MDT-PLMN-List	CRITICALITY ignore	EXTENSION MDT-PLMN-List							PRESENCE optional }|
+-- Extension for Release 11 rSRVCC operation --
+	{ ID id-RSRVCC-Operation-Possible		CRITICALITY ignore	EXTENSION RSRVCC-Operation-Possible			PRESENCE optional }|
+-- Extension for Release 11 to inidcate the last E-UTRAN PLMN Identity --
+	{ ID id-LastE-UTRANPLMNIdentity			CRITICALITY ignore	EXTENSION PLMNidentity							PRESENCE optional }|
+	{ ID id-PowerSavingIndicator			CRITICALITY ignore	EXTENSION PowerSavingIndicator					PRESENCE optional },
 	...
 }
 
@@ -1850,16 +1923,20 @@ LocationReportIEs RANAP-PROTOCOL-IES ::= {
 
 LocationReportExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 4 to enable report of Last Known Service Area with its Age over Iu --
-	{ ID id-LastKnownServiceArea	CRITICALITY ignore	EXTENSION LastKnownServiceArea	PRESENCE optional} |
+	{ ID id-LastKnownServiceArea				CRITICALITY ignore	EXTENSION LastKnownServiceArea						PRESENCE optional} |
 -- Extension for Release 5 to pass the positioning methods that have been used --
-	{ ID id-PositionData	CRITICALITY ignore		EXTENSION PositionData	PRESENCE optional}|
+	{ ID id-PositionData						CRITICALITY ignore	EXTENSION PositionData									PRESENCE optional}|
 -- Extension for Release 5 to pass the positioning methods that have been used for GERAN Iu mode --
-	{ ID id-PositionDataSpecificToGERANIuMode		CRITICALITY ignore	EXTENSION PositionDataSpecificToGERANIuMode		PRESENCE optional	}|
+	{ ID id-PositionDataSpecificToGERANIuMode	CRITICALITY ignore	EXTENSION PositionDataSpecificToGERANIuMode		PRESENCE optional}|
 	-- This extension is optional for GERAN Iu mode only, not applicable for UTRAN --
 -- Extension for Release 6 to indicate whether the returned position estimate satisfies the requested accuracy or not --
-	{ ID id-AccuracyFulfilmentIndicator	CRITICALITY ignore	EXTENSION AccuracyFulfilmentIndicator	PRESENCE optional}|
+	{ ID id-AccuracyFulfilmentIndicator			CRITICALITY ignore	EXTENSION AccuracyFulfilmentIndicator				PRESENCE optional}|
 -- Extension for Release 7 to provide a velocity estimate --
-	{ ID id-VelocityEstimate	CRITICALITY ignore	EXTENSION VelocityEstimate	PRESENCE optional},
+	{ ID id-VelocityEstimate					CRITICALITY ignore	EXTENSION VelocityEstimate								PRESENCE optional}|
+-- Extension for Release 13 to provide a barometric pressure --
+	{ ID id-BarometricPressure					CRITICALITY ignore	EXTENSION BarometricPressure							PRESENCE optional}|
+-- Extension for Release 13 to provide a civic address --
+	{ ID id-CivicAddress						CRITICALITY ignore	EXTENSION CivicAddress									PRESENCE optional},
 	...
 }
 
@@ -1911,9 +1988,18 @@ InitialUE-MessageExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 9 to allow communication of the cell access mode --
 	{ ID id-Cell-Access-Mode				CRITICALITY reject	EXTENSION Cell-Access-Mode					PRESENCE optional}|
 -- Extension for Release 10 to support LIPA --
-	{ ID id-LGW-TransportLayerAddress		CRITICALITY reject	EXTENSION TransportLayerAddress				PRESENCE optional}|
+	{ ID id-LGW-TransportLayerAddress		CRITICALITY ignore	EXTENSION TransportLayerAddress				PRESENCE optional}|
 -- Extension for Release 9 to enable the CN to handle potential UE NAS QoS issues related to higher bitrates --
-	{ ID id-HigherBitratesThan16MbpsFlag	CRITICALITY ignore	EXTENSION HigherBitratesThan16MbpsFlag	PRESENCE optional},
+	{ ID id-HigherBitratesThan16MbpsFlag	CRITICALITY ignore	EXTENSION HigherBitratesThan16MbpsFlag	PRESENCE optional}|
+-- Extension for Release 11 to support BBAI --
+	{ ID id-Tunnel-Information-for-BBF		CRITICALITY ignore	EXTENSION TunnelInformation					PRESENCE optional}|
+-- Extension for Release 12 to support SIPTO@LN with collocated L-GW--
+	{ ID id-SIPTO-LGW-TransportLayerAddress	CRITICALITY ignore	EXTENSION TransportLayerAddress				PRESENCE optional}|
+-- Extension for Release 12 to support SIPTO@LN Stand-Alone --
+	{ ID id-LHN-ID							CRITICALITY ignore	EXTENSION LHN-ID							PRESENCE optional}|
+-- Extension for Release 13 to support DCN --
+	{ ID id-SGSN-Group-Identity				CRITICALITY ignore	EXTENSION SGSN-Group-Identity				PRESENCE optional}|
+	{ ID id-UE-Usage-Type					CRITICALITY ignore	EXTENSION UE-Usage-Type						PRESENCE optional},
 	...
 }
 
@@ -1946,23 +2032,28 @@ DirectTransferIEs RANAP-PROTOCOL-IES ::= {
 
 DirectTransferExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to enable rerouting in MOCN configuration for network sharing non-supporting UEs --
-	{ ID id-RedirectionIndication			CRITICALITY ignore	EXTENSION RedirectionIndication					PRESENCE optional}|
+	{ ID id-RedirectionIndication				CRITICALITY ignore	EXTENSION RedirectionIndication				PRESENCE optional}|
 -- Extension for Release 6 to indicate the MOCN rerouting is completed --
-	{ ID id-RedirectionCompleted			CRITICALITY ignore	EXTENSION RedirectionCompleted					PRESENCE optional}|
+	{ ID id-RedirectionCompleted				CRITICALITY ignore	EXTENSION RedirectionCompleted				PRESENCE optional}|
 -- Extension for Release 8 to indicate the Subscriber Profile ID for RAT/Frequency Selection Priority --
-	{ ID id-SubscriberProfileIDforRFP		CRITICALITY ignore	EXTENSION SubscriberProfileIDforRFP			PRESENCE optional}|
+	{ ID id-SubscriberProfileIDforRFP			CRITICALITY ignore	EXTENSION SubscriberProfileIDforRFP			PRESENCE optional}|
 -- Extension for Release 10 to support LIPA --
-	{ ID id-LGW-TransportLayerAddress		CRITICALITY reject	EXTENSION TransportLayerAddress					PRESENCE optional},
+	{ ID id-LGW-TransportLayerAddress			CRITICALITY ignore	EXTENSION TransportLayerAddress				PRESENCE optional}|
+-- Extension for Release 12 to support SIPTO@LN with collocated L-GW --
+	{ ID id-SIPTO-LGW-TransportLayerAddress		CRITICALITY ignore	EXTENSION TransportLayerAddress				PRESENCE optional}|
+-- Extension for Release 12 to support SIPTO@LN Stand-Alone --
+	{ ID id-LHN-ID								CRITICALITY ignore	EXTENSION LHN-ID								PRESENCE optional},
 	...
 }
 
 RedirectionIndication ::= ProtocolIE-Container { {RedirectionIndication-IEs} }
 
 RedirectionIndication-IEs RANAP-PROTOCOL-IES ::= {
-	{	ID id-NAS-PDU				CRITICALITY ignore TYPE NAS-PDU				PRESENCE mandatory }|
-	{	ID id-RejectCauseValue		CRITICALITY ignore TYPE RejectCauseValue	PRESENCE mandatory}|
-	{	ID id-NAS-SequenceNumber	CRITICALITY ignore TYPE NAS-SequenceNumber	PRESENCE optional}|
-	{	ID id-PermanentNAS-UE-ID	CRITICALITY ignore TYPE PermanentNAS-UE-ID	PRESENCE optional},
+	{	ID id-NAS-PDU										CRITICALITY ignore TYPE NAS-PDU													PRESENCE mandatory}|
+	{	ID id-RejectCauseValue								CRITICALITY ignore TYPE RejectCauseValue										PRESENCE mandatory}|
+	{	ID id-NAS-SequenceNumber							CRITICALITY ignore TYPE NAS-SequenceNumber									PRESENCE optional}|
+	{	ID id-PermanentNAS-UE-ID							CRITICALITY ignore TYPE PermanentNAS-UE-ID									PRESENCE optional}|
+	{	ID id-Additional-CSPS-coordination-information		CRITICALITY reject TYPE Additional-CSPS-coordination-information		PRESENCE optional},
 	...
 }
 
@@ -2151,7 +2242,9 @@ RAB-SetupOrModifyItemFirst-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 8 to enable handover restriction to E-UTRAN --
 	{ ID id-E-UTRAN-Service-Handover		CRITICALITY ignore	EXTENSION E-UTRAN-Service-Handover	PRESENCE optional}|
 -- Extension for Release 10 to support LIPA --
-	{ ID id-Correlation-ID					CRITICALITY ignore	EXTENSION Correlation-ID				PRESENCE optional},
+	{ ID id-Correlation-ID					CRITICALITY ignore	EXTENSION Correlation-ID				PRESENCE optional}|
+-- Extension for Release 12 to support SIPTO@LN with collocated L-GW --
+	{ ID id-SIPTO-Correlation-ID			CRITICALITY ignore	EXTENSION Correlation-ID				PRESENCE optional},
 	...
 }
 
@@ -2471,12 +2564,14 @@ TNLInformationEnhRelInfoReq-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 
 RANAP-EnhancedRelocationInformationRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-IntegrityProtectionInformation	CRITICALITY ignore	EXTENSION IntegrityProtectionInformation	PRESENCE optional} |
-	{ ID id-EncryptionInformation			CRITICALITY ignore	EXTENSION EncryptionInformation 				PRESENCE optional} |
+	{ ID id-EncryptionInformation			CRITICALITY ignore	EXTENSION EncryptionInformation					PRESENCE optional} |
 	{ ID id-UE-AggregateMaximumBitRate		CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate			PRESENCE optional} |
 -- Extension for Release 10 to enable RNSAP Relocation --
 	{ ID id-RABParametersList				CRITICALITY reject	EXTENSION RABParametersList						PRESENCE optional} |
 	{ ID id-CSG-Id							CRITICALITY reject	EXTENSION CSG-Id								PRESENCE optional} |
-	{ ID id-CSG-Membership-Status			CRITICALITY reject	EXTENSION CSG-Membership-Status				PRESENCE optional},
+	{ ID id-CSG-Membership-Status			CRITICALITY reject	EXTENSION CSG-Membership-Status					PRESENCE optional} |
+-- Extension for Release 11 to support rSRVCC in case of network sharing –
+	{ ID id-AnchorPLMN-ID					CRITICALITY ignore	EXTENSION PLMNidentity							PRESENCE optional},
 	...
 }
 
@@ -2618,7 +2713,7 @@ LocationRelatedDataRequest ::= SEQUENCE {
 
 LocationRelatedDataRequestIEs RANAP-PROTOCOL-IES ::= {
 	{ ID id-LocationRelatedDataRequestType		CRITICALITY reject	TYPE LocationRelatedDataRequestType		PRESENCE optional	},
-	-- This IE is mandatory for UTRAN, optional for GERAN Iu Mode --
+	-- This IE is mandatory for UTRAN, optional for GERAN Iu Mode –-
 	...
 }
 
@@ -2627,7 +2722,7 @@ LocationRelatedDataRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-LocationRelatedDataRequestTypeSpecificToGERANIuMode		CRITICALITY reject	EXTENSION LocationRelatedDataRequestTypeSpecificToGERANIuMode		PRESENCE optional	}|
 	-- The previous extension is optional for GERAN Iu Mode only, not applicable for UTRAN --
 	-- Extension for Release 7 to request GANSS Assistance Data. This IE shall be present if the Requested Location Related Data Type IE is set to
-	-- 'Dedicated Assistance Data for Assisted GANSS' or `Dedicated Assistance Data for Assisted GPS and GANSS'--
+	-- ‘Dedicated Assistance Data for Assisted GANSS’ or `Dedicated Assistance Data for Assisted GPS and GANSS’--
 	{ ID id-RequestedGANSSAssistanceData							CRITICALITY reject	EXTENSION RequestedGANSSAssistanceData							PRESENCE conditional	},
 	...
 }
@@ -2944,10 +3039,12 @@ MBMSSessionStartIEs RANAP-PROTOCOL-IES ::= {
 
 MBMSSessionStartExtensions RANAP-PROTOCOL-EXTENSION ::= {
 -- Extension for Release 6 to enable MBMS counting in broadcast mode --
-	{ ID id-MBMSCountingInformation			CRITICALITY ignore		EXTENSION MBMSCountingInformation				PRESENCE optional	} |
-	{ ID id-MBMSSynchronisationInformation	CRITICALITY ignore		EXTENSION MBMSSynchronisationInformation		PRESENCE optional	} |
+	{ ID id-MBMSCountingInformation				CRITICALITY ignore	EXTENSION MBMSCountingInformation					PRESENCE optional}|
+	{ ID id-MBMSSynchronisationInformation		CRITICALITY ignore	EXTENSION MBMSSynchronisationInformation			PRESENCE optional}|
 -- Extension for Release Release 9 to enable a new value --
-	{ ID id-PDP-TypeInformation-extension 	CRITICALITY ignore		EXTENSION PDP-TypeInformation-extension		PRESENCE optional	},
+	{ ID id-PDP-TypeInformation-extension		CRITICALITY ignore	EXTENSION PDP-TypeInformation-extension			PRESENCE optional}|
+-- Extension for Release 12 to support Session re-establishment --
+	{ ID id-Session-Re-establishment-Indicator	CRITICALITY ignore	EXTENSION Session-Re-establishment-Indicator		PRESENCE optional},
 	...
 }
 
@@ -3491,6 +3588,133 @@ SRVCC-CSKeysResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- UE RADIO CAPABILITY MATCH PROCEDURE
+--
+-- **************************************************************
+
 
-END
+-- **************************************************************
+--
+-- UE Radio Capability Match Request
+--
+-- **************************************************************
+
+UeRadioCapabilityMatchRequest ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container		{ {UeRadioCapabilityMatchRequestIEs} },
+	protocolExtensions		ProtocolExtensionContainer	{ {UeRadioCapabilityMatchRequestExtensions} }			OPTIONAL,
+	...
+}
+
+UeRadioCapabilityMatchRequestIEs RANAP-PROTOCOL-IES ::= {
+	...
+}
+
+UeRadioCapabilityMatchRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- UE Radio Capability Match Response
+--
+-- **************************************************************
+
+UeRadioCapabilityMatchResponse ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container		{ {UeRadioCapabilityMatchResponseIEs} },
+	protocolExtensions		ProtocolExtensionContainer	{ {UeRadioCapabilityMatchResponseExtensions} }				OPTIONAL,
+	...
+}
+
+UeRadioCapabilityMatchResponseIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-VoiceSupportMatchIndicator		CRITICALITY reject	TYPE VoiceSupportMatchIndicator		PRESENCE mandatory	},
+	...
+}
 
+UeRadioCapabilityMatchResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- UE REGISTRATION QUERY PROCEDURE
+--
+-- **************************************************************
+
+
+-- **************************************************************
+--
+-- UE Registration Query Request
+--
+-- **************************************************************
+
+UeRegistrationQueryRequest ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container		{ {UeRegistrationQueryRequestIEs} },
+	protocolExtensions		ProtocolExtensionContainer	{ {UeRegistrationQueryRequestExtensions} }			OPTIONAL,
+	...
+}
+
+UeRegistrationQueryRequestIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-IuSigConId				CRITICALITY ignore	TYPE IuSignallingConnectionIdentifier	PRESENCE mandatory}|
+	{ ID id-PermanentNAS-UE-ID		CRITICALITY ignore	TYPE PermanentNAS-UE-ID					PRESENCE mandatory},
+	...
+}
+
+UeRegistrationQueryRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- UE Registration Query Response
+--
+-- **************************************************************
+
+UeRegistrationQueryResponse ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container		{ {UeRegistrationQueryResponseIEs} },
+	protocolExtensions		ProtocolExtensionContainer	{ {UeRegistrationQueryResponseExtensions} }				OPTIONAL,
+	...
+}
+
+UeRegistrationQueryResponseIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-UERegistrationQueryResult		CRITICALITY ignore	TYPE UERegistrationQueryResult	PRESENCE mandatory},
+	...
+}
+
+UeRegistrationQueryResponseExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- REROUTE NAS REQUEST PROCEDURE
+--
+-- **************************************************************
+
+
+-- **************************************************************
+--
+-- Reroute NAS Request
+--
+-- **************************************************************
+
+RerouteNASRequest ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container		{ {RerouteNASRequestIEs} },
+	protocolExtensions		ProtocolExtensionContainer	{ {RerouteNASRequestExtensions} }			OPTIONAL,
+	...
+}
+
+RerouteNASRequestIEs RANAP-PROTOCOL-IES ::= {
+	{ ID id-RANAP-Message				CRITICALITY ignore	TYPE OCTET STRING			PRESENCE mandatory}|
+	{ ID id-SGSN-Group-Identity			CRITICALITY ignore	TYPE SGSN-Group-Identity	PRESENCE mandatory}|
+	{ ID id-P-TMSI						CRITICALITY ignore	TYPE P-TMSI					PRESENCE optional}|
+	{ ID id-UE-Usage-Type				CRITICALITY ignore	TYPE UE-Usage-Type			PRESENCE optional},
+	...
+}
+
+RerouteNASRequestExtensions RANAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+END
diff --git a/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn b/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn
index efb2e2e1e8..4f5b38bc4e 100644
--- a/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/ranap/RANAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- RANAP-PDU-Descriptions.asn
 --
--- 3GPP TS 25.413 V10.4.0 (2011-12)
+-- 3GPP TS 25.413 V13.2.0 (2016-06)
 -- http://www.3gpp.org/ftp/Specs/html-info/25413.htm
 --
 -- 9.3.2	Elementary Procedure Definitions
@@ -110,7 +110,13 @@ FROM RANAP-CommonDataTypes
 	MBMSRABRelease,
 	MBMSRABReleaseFailure,
 	SRVCC-CSKeysRequest,
-	SRVCC-CSKeysResponse
+	SRVCC-CSKeysResponse,
+	UeRadioCapabilityMatchRequest,
+	UeRadioCapabilityMatchResponse,
+	UeRegistrationQueryRequest,
+	UeRegistrationQueryResponse,
+	RerouteNASRequest
+
 FROM RANAP-PDU-Contents
 
 	id-LocationRelatedData,
@@ -158,7 +164,10 @@ FROM RANAP-PDU-Contents
 	id-MBMSCNDe-Registration-Procedure,
 	id-MBMSRABEstablishmentIndication,
 	id-MBMSRABRelease,
-	id-SRVCCPreparation
+	id-SRVCCPreparation,
+	id-UeRadioCapabilityMatch,
+	id-UeRegistrationQuery,
+	id-RerouteNASRequest
 
 FROM RANAP-Constants;
 
@@ -260,7 +269,9 @@ RANAP-ELEMENTARY-PROCEDURES-CLASS-1 RANAP-ELEMENTARY-PROCEDURE ::= {
 	mBMSRABRelease				|
 	enhancedRelocationComplete	|
 	rANAP-enhancedRelocation	|
-	sRVCCPreparation}
+	sRVCCPreparation			|
+	ueRadioCapabilityMatch		|
+	ueRegistrationQuery }
 
 RANAP-ELEMENTARY-PROCEDURES-CLASS-2 RANAP-ELEMENTARY-PROCEDURE ::= {
 	rAB-ReleaseRequest		|
@@ -286,7 +297,8 @@ RANAP-ELEMENTARY-PROCEDURES-CLASS-2 RANAP-ELEMENTARY-PROCEDURE ::= {
 	uESpecificInformation	|
 	directInformationTransfer	|
 	mBMSRABEstablishmentIndication	|
-	enhancedRelocationCompleteConfirm
+	enhancedRelocationCompleteConfirm	|
+	rerouteNASRequest
 }
 
 RANAP-ELEMENTARY-PROCEDURES-CLASS-3 RANAP-ELEMENTARY-PROCEDURE ::= {
@@ -611,5 +623,24 @@ sRVCCPreparation RANAP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY			reject
 }
 
-END
+ueRadioCapabilityMatch RANAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UeRadioCapabilityMatchRequest
+	OUTCOME					UeRadioCapabilityMatchResponse
+	PROCEDURE CODE			id-UeRadioCapabilityMatch
+	CRITICALITY				ignore
+}
 
+ueRegistrationQuery RANAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UeRegistrationQueryRequest
+	OUTCOME					UeRegistrationQueryResponse
+	PROCEDURE CODE			id-UeRegistrationQuery
+	CRITICALITY				ignore
+}
+
+rerouteNASRequest RANAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	RerouteNASRequest
+	PROCEDURE CODE		id-RerouteNASRequest
+	CRITICALITY			reject
+}
+
+END
diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf
index 877d64c65b..bdbc463291 100644
--- a/epan/dissectors/asn1/ranap/ranap.cnf
+++ b/epan/dissectors/asn1/ranap/ranap.cnf
@@ -464,6 +464,9 @@ id-enhancedRelocationComplete         ProcedureCode
 id-enhancedRelocationCompleteConfirm  ProcedureCode
 id-RANAPenhancedRelocation            ProcedureCode
 id-SRVCCPreparation                   ProcedureCode
+id-UeRadioCapabilityMatch             ProcedureCode
+id-UeRegistrationQuery                ProcedureCode
+id-RerouteNASRequest                  ProcedureCode
 
 # ProtocolIE-ID
 id-AreaIdentity                                 ProtocolIE-ID
@@ -721,6 +724,44 @@ id-Management-Based-MDT-Allowed                 ProtocolIE-ID
 id-HigherBitratesThan16MbpsFlag                 ProtocolIE-ID
 id-Trace-Collection-Entity-IP-Addess            ProtocolIE-ID
 id-End-Of-CSFB                                  ProtocolIE-ID
+id-Time-UE-StayedInCell-EnhancedGranularity     ProtocolIE-ID
+id-Out-Of-UTRAN                                 ProtocolIE-ID
+id-TraceRecordingSessionReference               ProtocolIE-ID
+id-IMSI                                         ProtocolIE-ID
+id-HO-Cause                                     ProtocolIE-ID
+id-VoiceSupportMatchIndicator                   ProtocolIE-ID
+id-RSRVCC-HO-Indication                         ProtocolIE-ID
+id-RSRVCC-Information                           ProtocolIE-ID
+id-AnchorPLMN-ID                                ProtocolIE-ID
+id-Tunnel-Information-for-BBF                   ProtocolIE-ID
+id-Management-Based-MDT-PLMN-List               ProtocolIE-ID
+id-SignallingBasedMDTPLMNList                   ProtocolIE-ID
+id-M4Report                                     ProtocolIE-ID
+id-M5Report                                     ProtocolIE-ID
+id-M6Report                                     ProtocolIE-ID
+id-M7Report                                     ProtocolIE-ID
+id-TimingDifferenceULDL                         ProtocolIE-ID
+id-Serving-Cell-Identifier                      ProtocolIE-ID
+id-EARFCN-Extended                              ProtocolIE-ID
+id-RSRVCC-Operation-Possible                    ProtocolIE-ID
+id-SIPTO-LGW-TransportLayerAddress              ProtocolIE-ID
+id-SIPTO-Correlation-ID                         ProtocolIE-ID
+id-LHN-ID                                       ProtocolIE-ID
+id-Session-Re-establishment-Indicator           ProtocolIE-ID
+id-LastE-UTRANPLMNIdentity                      ProtocolIE-ID
+id-RSRQ-Type                                    ProtocolIE-ID
+id-RSRQ-Extension                               ProtocolIE-ID
+id-Additional-CSPS-coordination-information     ProtocolIE-ID
+id-UERegistrationQueryResult                    ProtocolIE-ID
+id-IuSigConIdRangeEnd                           ProtocolIE-ID
+id-BarometricPressure                           ProtocolIE-ID
+id-Additional-PositioningDataSet                ProtocolIE-ID
+id-CivicAddress                                 ProtocolIE-ID
+id-SGSN-Group-Identity                          ProtocolIE-ID
+id-P-TMSI                                       ProtocolIE-ID
+id-RANAP-Message                                ProtocolIE-ID
+id-PowerSavingIndicator                         ProtocolIE-ID
+id-UE-Usage-Type                                ProtocolIE-ID
 #.END
 
 #.REGISTER
@@ -872,6 +913,11 @@ EncryptionKey                                             N ranap.ies id-Encrypt
 IntegrityProtectionKey                                    N ranap.ies id-IntegrityProtectionKey
 SRVCC-Information                                         N ranap.ies id-SRVCC-Information
 GlobalCN-ID                                               N ranap.ies id-GlobalCN-IDPS
+VoiceSupportMatchIndicator                                N ranap.ies id-VoiceSupportMatchIndicator
+SGSN-Group-Identity                                       N ranap.ies id-SGSN-Group-Identity
+P-TMSI                                                    N ranap.ies id-P-TMSI
+#N ranap.ies id-RANAP-Message
+UE-Usage-Type                                             N ranap.ies id-UE-Usage-Type
 
 #RANAP-PROTOCOL-IES-PAIR
 RAB-SetupOrModifyItemFirst                                N ranap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -982,6 +1028,41 @@ Management-Based-MDT-Allowed                              N ranap.extension id-M
 HigherBitratesThan16MbpsFlag                              N ranap.extension id-HigherBitratesThan16MbpsFlag
 TransportLayerAddress                                     N ranap.extension id-Trace-Collection-Entity-IP-Addess
 End-Of-CSFB                                               N ranap.extension id-End-Of-CSFB
+Time-UE-StayedInCell-EnhancedGranularity                  N ranap.extension id-Time-UE-StayedInCell-EnhancedGranularity
+Out-Of-UTRAN                                              N ranap.extension id-Out-Of-UTRAN
+
+TraceRecordingSessionReference                            N ranap.extension id-TraceRecordingSessionReference
+IMSI                                                      N ranap.extension id-IMSI
+Cause                                                     N ranap.extension id-HO-Cause
+RSRVCC-HO-Indication                                      N ranap.extension id-RSRVCC-HO-Indication
+RSRVCC-Information                                        N ranap.extension id-RSRVCC-Information
+PLMNidentity                                              N ranap.extension id-AnchorPLMN-ID
+TunnelInformation                                         N ranap.extension id-Tunnel-Information-for-BBF
+MDT-PLMN-List                                             N ranap.extension id-Management-Based-MDT-PLMN-List
+MDT-PLMN-List                                             N ranap.extension id-SignallingBasedMDTPLMNList
+M4Report                                                  N ranap.extension id-M4Report
+M5Report                                                  N ranap.extension id-M5Report
+M6Report                                                  N ranap.extension id-M6Report
+M7Report                                                  N ranap.extension id-M7Report
+TimingDifferenceULDL                                      N ranap.extension id-TimingDifferenceULDL
+UTRAN-CellID                                              N ranap.extension id-Serving-Cell-Identifier
+EARFCN-Extended                                           N ranap.extension id-EARFCN-Extended
+RSRVCC-Operation-Possible                                 N ranap.extension id-RSRVCC-Operation-Possible
+TransportLayerAddress                                     N ranap.extension id-SIPTO-LGW-TransportLayerAddress
+Correlation-ID                                            N ranap.extension id-SIPTO-Correlation-ID
+LHN-ID                                                    N ranap.extension id-LHN-ID
+Session-Re-establishment-Indicator                        N ranap.extension id-Session-Re-establishment-Indicator
+PLMNidentity                                              N ranap.extension id-LastE-UTRANPLMNIdentity
+RSRQ-Type                                                 N ranap.extension id-RSRQ-Type
+RSRQ-Extension                                            N ranap.extension id-RSRQ-Extension
+Additional-CSPS-coordination-information                  N ranap.extension id-Additional-CSPS-coordination-information
+UERegistrationQueryResult                                 N ranap.extension id-UERegistrationQueryResult
+IuSignallingConnectionIdentifier                          N ranap.extension id-IuSigConIdRangeEnd
+BarometricPressure                                        N ranap.extension id-BarometricPressure
+Additional-PositioningDataSet                             N ranap.extension id-Additional-PositioningDataSet
+CivicAddress                                              N ranap.extension id-CivicAddress
+PowerSavingIndicator                                      N ranap.extension id-PowerSavingIndicator
+
 
 #RANAP-ELEMENTARY-PROCEDURE
 Iu-ReleaseCommand                             N ranap.proc.imsg id-Iu-Release
@@ -1066,6 +1147,13 @@ RANAP-EnhancedRelocationInformationResponse   N ranap.proc.sout id-RANAPenhanced
 SRVCC-CSKeysRequest                           N ranap.proc.imsg id-SRVCCPreparation
 SRVCC-CSKeysResponse                          N ranap.proc.out id-SRVCCPreparation
 
+UeRadioCapabilityMatchRequest                 N ranap.proc.imsg id-UeRadioCapabilityMatch
+UeRadioCapabilityMatchResponse                N ranap.proc.out id-UeRadioCapabilityMatch
+
+UeRegistrationQueryRequest                    N ranap.proc.imsg id-UeRegistrationQuery
+UeRegistrationQueryResponse                   N ranap.proc.out id-UeRegistrationQuery
+
+RerouteNASRequest                             N ranap.proc.imsg id-RerouteNASRequest
 #.END
 
 #