Update to V11.5.0 (2012-12).

svn path=/trunk/; revision=48195

24 files changed, 317 insertions, 81 deletions

diff --git a/asn1/gsm_map/MAP-ApplicationContexts.asn b/asn1/gsm_map/MAP-ApplicationContexts.asn
index f91f3403c3..f69671823c 100644
--- a/asn1/gsm_map/MAP-ApplicationContexts.asn
+++ b/asn1/gsm_map/MAP-ApplicationContexts.asn
@@ -1,7 +1,8 @@
 -- $Id$
 --17.3.3	ASN.1 Module for application-context-names
 --The following ASN.1 module summarises the application-context-name assigned to MAP application-contexts.
--- 3GPP TS 29.002 V10.4.0 (2011-09)
+-- 3GPP TS 29.002 V11.5.0 (2012-12)
+
 MAP-ApplicationContexts {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-ApplicationContexts (2) version13 (13)}
@@ -43,8 +44,8 @@ authenticationFailureReportContext-v3  OBJECT IDENTIFIER ::=
 locationInfoRetrievalContext-v3  OBJECT IDENTIFIER ::=
 	{map-ac locInfoRetrieval(5) version3(3)}
 
-resetContext-v2  OBJECT IDENTIFIER ::=
-	{map-ac reset(10) version2(2)}
+resetContext-v3  OBJECT IDENTIFIER ::=
+	{map-ac reset(10) version3(3)}
 
 handoverControlContext-v3  OBJECT IDENTIFIER ::=
 	{map-ac handoverControl(11) version3(3)}
@@ -154,6 +155,13 @@ subscriberDataModificationNotificationContext-v3  OBJECT IDENTIFIER ::=
 resourceManagementContext-v3  OBJECT IDENTIFIER ::=
 	{map-ac resourceManagement(44) version3(3)}
 
+vcsgLocationUpdateContext-v3  OBJECT IDENTIFIER ::=
+	{map-ac vcsgLocationUpdate(46) version3(3)}
+
+vcsgLocationCancellationContext-v3  OBJECT IDENTIFIER ::=
+	{map-ac vcsgLocationCancel(47) version3(3)}
+
+
 -- The following Object Identifiers are reserved for application-contexts
 --  existing in previous versions of the protocol
 
@@ -168,6 +176,7 @@ resourceManagementContext-v3  OBJECT IDENTIFIER ::=
 -- locationInfoRetrievalContext-v1	map-ac locationInfoRetrieval (5)	version1 (1)
 -- locationInfoRetrievalContext-v2	map-ac locationInfoRetrieval (5)	version2 (2)
 -- resetContext-v1	map-ac reset (10)	version1 (1)
+-- resetContext-v2	map-ac reset (10)	version2 (2)
 -- handoverControlContext-v1	map-ac handoverControl (11)	version1 (1)
 -- handoverControlContext-v2	map-ac handoverControl (11)	version2 (2)
 -- sIWFSAllocationContext-v3	map-ac sIWFSAllocation (12)	version3 (3)
diff --git a/asn1/gsm_map/MAP-BS-Code.asn b/asn1/gsm_map/MAP-BS-Code.asn
index 3a68600988..04c31b3581 100644
--- a/asn1/gsm_map/MAP-BS-Code.asn
+++ b/asn1/gsm_map/MAP-BS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09) 
+-- 3GPP TS 29.002 V11.5.0 (2012-12) 
 -- 17.7.10	Bearer Service Codes
  
 MAP-BS-Code {
diff --git a/asn1/gsm_map/MAP-CH-DataTypes.asn b/asn1/gsm_map/MAP-CH-DataTypes.asn
index d141156c74..703da6b24d 100644
--- a/asn1/gsm_map/MAP-CH-DataTypes.asn
+++ b/asn1/gsm_map/MAP-CH-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)
+-- 3GPP TS 29.002 V11.5.0 (2012-12)
 -- 17.7.3	Call handling data types
  
 MAP-CH-DataTypes {
diff --git a/asn1/gsm_map/MAP-CallHandlingOperations.asn b/asn1/gsm_map/MAP-CallHandlingOperations.asn
index ee23e890e1..bc4a5d7105 100644
--- a/asn1/gsm_map/MAP-CallHandlingOperations.asn
+++ b/asn1/gsm_map/MAP-CallHandlingOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09) 
+-- 3GPP TS 29.002 V11.5.0 (2012-12) 
 --17.6.3	Call Handling Operations
 MAP-CallHandlingOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsm_map/MAP-CommonDataTypes.asn b/asn1/gsm_map/MAP-CommonDataTypes.asn
index 53702fc046..1e8240c1b2 100644
--- a/asn1/gsm_map/MAP-CommonDataTypes.asn
+++ b/asn1/gsm_map/MAP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)
+-- 3GPP TS 29.002 V11.5.0 (2012-12)
 -- 17.7.8	Common data types
 
 MAP-CommonDataTypes {
@@ -51,6 +51,7 @@ AccessNetworkSignalInfo,
 	E-UTRAN-CGI,
 	TA-Id,
 	RAIdentity,
+	NetworkNodeDiameterAddress,
 
 	-- data types for CAMEL
 	CellGlobalIdOrServiceAreaIdOrLAI, 
@@ -548,6 +549,10 @@ RAIdentity ::= OCTET STRING (SIZE (6))
 -- It shall contain the value part defined in 3GPP TS 29.060 only. I.e. the 3GPP TS 29.060
 -- type identifier octet shall not be included.
 
+NetworkNodeDiameterAddress::= SEQUENCE {
+	diameter-Name	[0] DiameterIdentity,
+	diameter-Realm	[1] DiameterIdentity }
+
 -- data types for CAMEL
 
 CellGlobalIdOrServiceAreaIdOrLAI ::= CHOICE {
diff --git a/asn1/gsm_map/MAP-DialogueInformation.asn b/asn1/gsm_map/MAP-DialogueInformation.asn
index 9aae3a5596..21375adc02 100644
--- a/asn1/gsm_map/MAP-DialogueInformation.asn
+++ b/asn1/gsm_map/MAP-DialogueInformation.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09) 
+-- 3GPP TS 29.002 V11.5.0 (2012-12) 
 -- 17.4	MAP Dialogue Information
 MAP-DialogueInformation {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsm_map/MAP-ER-DataTypes.asn b/asn1/gsm_map/MAP-ER-DataTypes.asn
index 8aee04256a..ed1c306082 100644
--- a/asn1/gsm_map/MAP-ER-DataTypes.asn
+++ b/asn1/gsm_map/MAP-ER-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09) 
+-- 3GPP TS V11.5.0 (2012-12) 
 -- 17.7.7	Error data types
 
 MAP-ER-DataTypes {
@@ -62,7 +62,9 @@ SS-NotAvailableParam,
 SS-SubscriptionViolationParam,
 InformationNotAvailableParam,
 TargetCellOutsideGCA-Param,
-OngoingGroupCallParam
+OngoingGroupCallParam,
+PositionMethodFailure-Diagnostic,
+UnauthorizedLCSClient-Diagnostic
 
 ;
 
@@ -75,7 +77,8 @@ FROM MAP-SS-DataTypes {
 	SignalInfo,
 	BasicServiceCode,
 	NetworkResource,
-	AdditionalNetworkResource
+	AdditionalNetworkResource,
+	IMSI
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)}
@@ -124,7 +127,11 @@ ExtensibleCallBarredParam ::= SEQUENCE {
 	callBarringCause	CallBarringCause	OPTIONAL,
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	... ,
-	unauthorisedMessageOriginator	[1] NULL		OPTIONAL }
+	unauthorisedMessageOriginator	[1] NULL		OPTIONAL,
+	anonymousCallRejection	[2] NULL		OPTIONAL }
+
+-- unauthorisedMessageOriginator and anonymousCallRejection shall be mutually exclusive. 
+
 
 CUG-RejectParam ::= SEQUENCE {
 	cug-RejectCause	CUG-RejectCause	OPTIONAL,
@@ -169,10 +176,13 @@ AbsentSubscriberSM-Param ::= SEQUENCE {
 	-- or for GPRS
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
-	additionalAbsentSubscriberDiagnosticSM  	[0] 	AbsentSubscriberDiagnosticSM	OPTIONAL }
+	additionalAbsentSubscriberDiagnosticSM  	[0] 	AbsentSubscriberDiagnosticSM	OPTIONAL,
 	-- if received, additionalAbsentSubscriberDiagnosticSM 
 	-- is for GPRS and absentSubscriberDiagnosticSM is 
 	-- for non-GPRS
+	imsi			[1] IMSI		OPTIONAL}
+	-- when sent from HLR to IP-SM-GW, IMSI shall be present if UNRI is not set 
+	-- to indicate that the absent condition is met for CS and PS but not for IMS.
 
 AbsentSubscriberDiagnosticSM ::= INTEGER (0..255)
 	-- AbsentSubscriberDiagnosticSM values are defined in 3GPP TS 23.040
@@ -203,7 +213,10 @@ DataMissingParam ::= SEQUENCE {
 
 UnexpectedDataParam ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
-	...}
+	...,
+	unexpectedSubscriber [0]	NULL			OPTIONAL}
+-- the unexpectedSubscriber indication in the unexpectedDataValue error shall not be used
+-- for operations that allow the unidentifiedSubscriber error.
 
 FacilityNotSupParam ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
@@ -416,5 +429,4 @@ OngoingGroupCallParam ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...}
 
-
 END
diff --git a/asn1/gsm_map/MAP-Errors.asn b/asn1/gsm_map/MAP-Errors.asn
index 54aa6eea10..642ef321e5 100644
--- a/asn1/gsm_map/MAP-Errors.asn
+++ b/asn1/gsm_map/MAP-Errors.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)  
+-- 3GPP TS 29.002 V11.5.0 (2012-12)  
 -- 17.6.6	Errors
  
 MAP-Errors {
diff --git a/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/asn1/gsm_map/MAP-ExtensionDataTypes.asn
index 7d8f94c78e..4744e7816e 100644
--- a/asn1/gsm_map/MAP-ExtensionDataTypes.asn
+++ b/asn1/gsm_map/MAP-ExtensionDataTypes.asn
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-ExtensionDataTypes.asn
 --
--- Taken from 3GPP TS 29.002 V10.4.0 (2011-09)
+-- Taken from 3GPP TS 29.002 V11.5.0 (2012-12)
 --
 -- 17.7.11 Extension data types
 --
diff --git a/asn1/gsm_map/MAP-GR-DataTypes.asn b/asn1/gsm_map/MAP-GR-DataTypes.asn
index b04fdd84c8..067fd8cbcc 100644
--- a/asn1/gsm_map/MAP-GR-DataTypes.asn
+++ b/asn1/gsm_map/MAP-GR-DataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- Taken from 3GPP TS 29.002 V10.4.0 (2011-09)
+-- Taken from 3GPP TS 29.002 V11.5.0 (2012-12)
 --
 --17.7.12	Group Call data types
  
diff --git a/asn1/gsm_map/MAP-Group-Call-Operations.asn b/asn1/gsm_map/MAP-Group-Call-Operations.asn
index 26c1e35e35..99f7c3dc75 100644
--- a/asn1/gsm_map/MAP-Group-Call-Operations.asn
+++ b/asn1/gsm_map/MAP-Group-Call-Operations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)  
+-- 3GPP TS 29.002 V11.5.0 (2012-12)  
 -- 17.6.7	Group Call operations
  
 MAP-Group-Call-Operations {
diff --git a/asn1/gsm_map/MAP-LCS-DataTypes.asn b/asn1/gsm_map/MAP-LCS-DataTypes.asn
index 661a225bce..1b0860f588 100644
--- a/asn1/gsm_map/MAP-LCS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-LCS-DataTypes.asn
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-LCS-DataTypes.asn
 --
--- Taken from 3GPP TS 29.002  V10.4.0 (2011-09)
+-- Taken from 3GPP TS 29.002  V11.5.0 (2012-12)
 --
 -- 17.7.13 Location service data types
 --
@@ -38,7 +38,9 @@ LCSCodeword,
 AreaEventInfo,
 ReportingPLMNList,
 PeriodicLDRInfo,
-SequenceNumber
+SequenceNumber,
+LCSClientType,
+LCS-Priority
 ;
 
 IMPORTS
diff --git a/asn1/gsm_map/MAP-LocationServiceOperations.asn b/asn1/gsm_map/MAP-LocationServiceOperations.asn
index dddf195c13..40b09dbb28 100644
--- a/asn1/gsm_map/MAP-LocationServiceOperations.asn
+++ b/asn1/gsm_map/MAP-LocationServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)  
+-- 3GPP TS 29.002 V11.5.0 (2012-12)  
 -- 17.6.8	Location service operations
  
 MAP-LocationServiceOperations {
diff --git a/asn1/gsm_map/MAP-MS-DataTypes.asn b/asn1/gsm_map/MAP-MS-DataTypes.asn
index 60274d696c..3d09d42786 100644
--- a/asn1/gsm_map/MAP-MS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-MS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.3.0 (2010-09) 
+-- 3GPP TS 29.002 V11.5.0 (2012-12) 
 -- 17.7.1	Mobile Service data types
 
 MAP-MS-DataTypes {
@@ -19,7 +19,6 @@ EXPORTS
 	-- WS modification: for Ericsson proprietary extensions
 	RequestedEquipmentInfo,
 	-- End WS modification
-
 	-- location registration types
 	UpdateLocationArg,
 	UpdateLocationRes,
@@ -33,6 +32,10 @@ EXPORTS
 	UpdateGprsLocationRes,
 	IST-SupportIndicator, 
 	SupportedLCS-CapabilitySets,
+	UpdateVcsgLocationArg,
+	UpdateVcsgLocationRes,
+	CancelVcsgLocationArg,
+	CancelVcsgLocationRes,
 
 
 	-- handover types
@@ -81,6 +84,8 @@ D-CSI,
 	SS-CSI,
 	ServiceKey,
 	DefaultCallHandling,
+	DefaultSMS-Handling,
+	DefaultGPRS-Handling,
 	CamelCapabilityHandling,
 	BasicServiceCriteria,
 	SupportedCamelPhases,
@@ -220,7 +225,8 @@ DiameterIdentity,
 Time,
 E-UTRAN-CGI,
 TA-Id,
-RAIdentity
+RAIdentity,
+NetworkNodeDiameterAddress
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)}
@@ -260,7 +266,9 @@ UpdateLocationArg ::= SEQUENCE {
 	skipSubscriberDataUpdate	[15] NULL		OPTIONAL, 
 	-- The skipSubscriberDataUpdate parameter in the UpdateLocationArg and the ADD-Info
 	-- structures carry the same semantic.
-	restorationIndicator	[16]	NULL		OPTIONAL
+	restorationIndicator	[16]	NULL		OPTIONAL,
+	eplmn-List	[3] EPLMN-List	OPTIONAL,
+	mme-DiameterAddress	[4] NetworkNodeDiameterAddress	OPTIONAL
 	 }
 
 VLR-Capability ::= SEQUENCE{
@@ -275,7 +283,8 @@ VLR-Capability ::= SEQUENCE{
 	offeredCamel4CSIs	[6] OfferedCamel4CSIs	OPTIONAL,
 	supportedRAT-TypesIndicator	[7]	SupportedRAT-Types	OPTIONAL,
 	longGroupID-Supported	[8]	NULL		OPTIONAL,
-	mtRoamingForwardingSupported	[9]	NULL		OPTIONAL }
+	mtRoamingForwardingSupported	[9]	NULL		OPTIONAL,
+	msisdn-lessOperation-Supported	[10]	NULL		OPTIONAL }
 
 SupportedRAT-Types::= BIT STRING {
 	utran  (0),
@@ -367,6 +376,7 @@ TypeOfUpdate ::= ENUMERATED {
 	mme-change (1),
 	...}
 	-- TypeOfUpdate shall be absent if CancellationType is different from updateProcedure
+	-- and initialAttachProcedure
 
 CancellationType ::= ENUMERATED {
 	updateProcedure	(0),
@@ -541,7 +551,17 @@ UpdateGprsLocationArg ::= SEQUENCE {
 	areaRestricted	[11] NULL		OPTIONAL,
 	ue-reachableIndicator	[12]	NULL		OPTIONAL, 
 	epsSubscriptionDataNotNeeded	[13] NULL		OPTIONAL,
-	ue-srvcc-Capability	[14] UE-SRVCC-Capability	OPTIONAL }
+	ue-srvcc-Capability	[14] UE-SRVCC-Capability	OPTIONAL,
+	eplmn-List	[15] EPLMN-List	OPTIONAL,
+	mmeNumberforMTSMS	[16] ISDN-AddressString	OPTIONAL,
+	smsRegisterRequest	[17] SMSRegisterRequest	OPTIONAL,
+	sms-Only		[18] NULL		OPTIONAL }
+
+SMSRegisterRequest::= ENUMERATED {
+	sms-registration-required  (0),
+	sms-registration-not-preferred  (1),
+	no-preference  (2),
+	...}
 
 Used-RAT-Type::= ENUMERATED {
 	utran  (0),
@@ -569,7 +589,7 @@ PDN-GW-Update ::= SEQUENCE{
 
 
 ISR-Information::= BIT STRING {
-	updateMME  (0),
+	updateLocation  (0),
 	cancelSGSN  (1),
 	initialAttachIndicator  (2)} (SIZE (3..8))
 	-- exception handling: reception of unknown bit assignments in the
@@ -587,10 +607,14 @@ SGSN-Capability ::= SEQUENCE{
 	smsCallBarringSupportIndicator	[7]	NULL		OPTIONAL,	supportedRAT-TypesIndicator	[8]	SupportedRAT-Types	OPTIONAL,
 	supportedFeatures	[9] SupportedFeatures	OPTIONAL,
 	t-adsDataRetrieval	[10] NULL		OPTIONAL,
-	homogeneousSupportOfIMSVoiceOverPSSessions [11] BOOLEAN	OPTIONAL
+	homogeneousSupportOfIMSVoiceOverPSSessions [11] BOOLEAN	OPTIONAL,
 	--	"true" indicates homogeneous support, "false" indicates homogeneous non-support
 	--	in the complete SGSN area
- }
+ 	cancellationTypeInitialAttach	[12]	NULL		OPTIONAL,
+	additionalMsisdnSupport	[13]	NULL		OPTIONAL,
+	msisdn-lessOperation-Supported	[14]	NULL		OPTIONAL
+	}
+	--	the supportedFeatures is also applied to the MME/IWF
 
 SupportedFeatures::= BIT STRING {
 	odb-all-apn (0),
@@ -618,7 +642,14 @@ SupportedFeatures::= BIT STRING {
 	barring-OutgoingCalls (22),
 	baoc (23),
 	boic (24),
-	boicExHC (25)} (SIZE (26..40))
+	boicExHC (25),
+	localTimeZoneRetrieval (26),
+	additionalMsisdn (27),
+	smsInMME (28),
+	smsInSGSN (29)
+	} (SIZE (26..40))
+	--	the definition and usage of the above features see the 3GPP TS 29.272 [144].
+
 
 UE-SRVCC-Capability::= ENUMERATED {
 	ue-srvcc-not-supported  (0),
@@ -630,7 +661,11 @@ UpdateGprsLocationRes ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
 	add-Capability	NULL			OPTIONAL,
-	sgsn-mmeSeparationSupported	[0] NULL		OPTIONAL }
+	sgsn-mmeSeparationSupported	[0] NULL		OPTIONAL,
+ 	mmeRegisteredforSMS	[1] NULL		OPTIONAL }
+
+EPLMN-List ::= SEQUENCE SIZE (1..50) OF
+			PLMN-Id
 
 -- handover types
 
@@ -728,20 +763,29 @@ PrepareHO-Arg ::= [3] SEQUENCE {
 	tracePropagationList	[25]	TracePropagationList	OPTIONAL,
 	aoipSupportedCodecsListAnchor	[26] AoIPCodecsList	OPTIONAL,
 	regionalSubscriptionData	[27] ZoneCodeList	OPTIONAL,
-	globalCallReference	[28]	LCLS-GlobalCallReference	OPTIONAL,
-	lcls-Negotiation	[29]	LCLS-Negotiation	OPTIONAL	 }
+	lclsGlobalCallReference	[28]	LCLS-GlobalCallReference	OPTIONAL,
+	lcls-Negotiation	[29]	LCLS-Negotiation	OPTIONAL,
+	lcls-Configuration-Preference	[30]	LCLS-ConfigurationPreference	OPTIONAL,
+	csg-SubscriptionDataList	[31] CSG-SubscriptionDataList	OPTIONAL
+	 }
 
 LCLS-GlobalCallReference ::= OCTET STRING (SIZE (13..15))
 	-- Octets are coded as specified in 3GPP TS 29.205 [146]
 
 
 LCLS-Negotiation::= BIT STRING {
-	permission-indicator	(0),
-	forward-data-sending-indicator	(1),
-	backward-sending-indicator	(2),
-	forward-data-reception-indicator	(3),
-	backward-data-reception-indicator	(4)} (SIZE (5..8))
-	-- exception handling: bits 5 to 7 shall be ignored if received and not understood
+	permission-indicator-not-allowed-bit	(0),
+	permission-indicator-spare-bit	(1)} (SIZE (2..8))
+	--for definition and allowed combination of bits 0 and 1 see 3GPP TS 29.205
+	-- exception handling: bits 2 to 7 shall be ignored if received and not understood
+	 
+
+LCLS-ConfigurationPreference::= BIT STRING {
+	forward-data-sending-indicator	(0),
+	backward-data-sending-indicator	(1),
+	forward-data-reception-indicator	(2),
+	backward-data-reception-indicator	(3)} (SIZE (4..8))
+	-- exception handling: bits 4 to 7 shall be ignored if received and not understood
 	 
 
 BSSMAP-ServiceHandoverList ::= SEQUENCE SIZE (1.. maxNumOfServiceHandovers) OF
@@ -1093,7 +1137,11 @@ InsertSubscriberDataArg ::= SEQUENCE {
 	subscribedPeriodicRAUTAUtimer	[36]	SubscribedPeriodicRAUTAUtimer	OPTIONAL,
 	vplmnLIPAAllowed	[37]	NULL		OPTIONAL,
 	mdtUserConsent	[38]	BOOLEAN	OPTIONAL,
-	subscribedPeriodicLAUtimer	[39]	SubscribedPeriodicLAUtimer	OPTIONAL }
+	subscribedPeriodicLAUtimer	[39]	SubscribedPeriodicLAUtimer	OPTIONAL,
+	vplmn-Csg-SubscriptionDataList	[40]	VPLMN-CSG-SubscriptionDataList	OPTIONAL,
+	additionalMSISDN	[41]	ISDN-AddressString	OPTIONAL,
+	psAndSMS-OnlyServiceProvision	[42]	NULL		OPTIONAL,
+	smsInSGSNAllowed	[43]	NULL		OPTIONAL }
 	-- If the Network Access Mode parameter is sent, it shall be present only in 
 	-- the first sequence if seqmentation is used
 
@@ -1111,9 +1159,13 @@ CSG-SubscriptionData ::= SEQUENCE {
 	expirationDate		Time		OPTIONAL,
 	extensionContainer		ExtensionContainer 	OPTIONAL,
 	...,
-	lipa-AllowedAPNList		[0] LIPA-AllowedAPNList		OPTIONAL
+	lipa-AllowedAPNList		[0] LIPA-AllowedAPNList		OPTIONAL,
+	plmn-Id			[1] PLMN-Id		OPTIONAL
 }
 
+VPLMN-CSG-SubscriptionDataList ::= SEQUENCE SIZE (1..50) OF
+				CSG-SubscriptionData
+
 CSG-Id ::= BIT STRING (SIZE (27))
 	-- coded according to 3GPP TS 23.003 [17].
 
@@ -1133,10 +1185,14 @@ EPS-SubscriptionData ::= SEQUENCE {
 	extensionContainer	[5]	ExtensionContainer	OPTIONAL,
 	...,
 	mps-CSPriority	[7]	NULL		OPTIONAL,
-	mps-EPSPriority	[8]	NULL		OPTIONAL }
+	mps-EPSPriority	[8]	NULL		OPTIONAL,
+	subscribed-vsrvcc	[9]	NULL		OPTIONAL }
 	-- mps-CSPriority by its presence indicates that the UE is subscribed to the eMLPP in 
 	-- the CS domain, referring to the 3GPP TS 29.272 [144] for details.
 	-- mps-EPSPriority by its presence indicates that the UE is subscribed to the MPS in 
+	-- the EPS domain, referring to the 3GPP TS 29.272 [144] for details. 
+	--  
+	-- subscribed-vsrvcc by its presence indicates that the UE is subscribed to the vSRVCC in 
 	-- the EPS domain, referring to the 3GPP TS 29.272 [144] for details.
 
 APN-OI-Replacement ::=  OCTET STRING (SIZE (9..100))
@@ -1181,7 +1237,15 @@ APN-Configuration ::= SEQUENCE {
  }
 
 PDN-Type ::= OCTET STRING (SIZE (1))
-	-- Octet is coded according to TS 3GPP TS 29.274 [140]
+	-- Octet is coded  as follows:
+	--	Bits
+	--	3 2 1
+	--	0 0 1 IPv4
+	--	0 1 0 IPv6
+	--	0 1 1 IPv4v6
+	--	1 0 0 IPv4_or_IPv6
+	--	Bits 8-4 shall be coded as zero.
+	--	for details see 3GPP TS 29.272 [144]
 
 EPS-QoS-Subscribed ::= SEQUENCE {
 	qos-Class-Identifier	[0] QoS-Class-Identifier,
@@ -1870,7 +1934,12 @@ DeleteSubscriberDataArg ::= SEQUENCE {
 	stn-srWithdraw	[17] NULL		OPTIONAL,
 	epsSubscriptionDataWithdraw	[18] EPS-SubscriptionDataWithdraw	OPTIONAL,
 	apn-oi-replacementWithdraw	[19] NULL		OPTIONAL,
-	csg-SubscriptionDeleted	[20]	NULL		OPTIONAL }
+	csg-SubscriptionDeleted	[20]	NULL		OPTIONAL,
+	subscribedPeriodicTAU-RAU-TimerWithdraw	[22]	NULL	OPTIONAL,
+	subscribedPeriodicLAU-TimerWithdraw	[23]	NULL		OPTIONAL,
+	subscribed-vsrvccWithdraw	[21] NULL		OPTIONAL,
+	vplmn-Csg-SubscriptionDeleted	[24]	NULL		OPTIONAL,
+	additionalMSISDN-Withdraw	[25]	NULL		OPTIONAL }
 
 SpecificCSI-Withdraw ::= BIT STRING {
 	o-csi (0),
@@ -2394,10 +2463,16 @@ NoteMsPresentForGprsRes ::= SEQUENCE {
 -- fault recovery types
 
 ResetArg ::= SEQUENCE {
-	hlr-Number	ISDN-AddressString,
+	sendingNodenumber	SendingNode-Number,
 	hlr-List		HLR-List		OPTIONAL,
+	-- The hlr-List parameter shall only be applicable for a restart of the HSS/HLR.
+	extensionContainer	[0] ExtensionContainer	OPTIONAL,
 	...}
 
+SendingNode-Number ::= CHOICE {
+	hlr-Number	ISDN-AddressString,
+	css-Number	[1] ISDN-AddressString}
+
 RestoreDataArg ::= SEQUENCE {
 	imsi			IMSI,
 	lmsi			LMSI			OPTIONAL,
@@ -2502,7 +2577,9 @@ SubscriberInfo ::= SEQUENCE {
 	lastUE-ActivityTime	[10] Time		OPTIONAL,
 	lastRAT-Type	[11] Used-RAT-Type	OPTIONAL,
 	eps-SubscriberState	[12] PS-SubscriberState	OPTIONAL,
-	locationInformationEPS	[13] LocationInformationEPS	OPTIONAL }
+	locationInformationEPS	[13] LocationInformationEPS	OPTIONAL,
+	timeZone	[14] TimeZone	OPTIONAL,
+	daylightSavingTime	[15] DaylightSavingTime	OPTIONAL }
 
 --	If the HLR receives locationInformation, subscriberState or ms-Classmark2 from an SGSN or
 --	MME (via an IWF), it shall discard them.
@@ -2518,6 +2595,16 @@ IMS-VoiceOverPS-SessionsInd ::= ENUMERATED {
 	}
 --	"unknown" shall not be used within ProvideSubscriberInfoRes
 
+TimeZone ::= OCTET STRING (SIZE (2..3))
+--	Refer to the 3GPP TS 29.272 [144] for details.
+
+DaylightSavingTime ::= ENUMERATED {
+	noAdjustment	(0),
+	plusOneHourAdjustment	(1),
+	plusTwoHoursAdjustment	(2)
+	}
+--	Refer to the 3GPP TS 29.272 [144] for details.
+
 MNPInfoRes ::= SEQUENCE {
 	routeingNumber	[0] RouteingNumber 	OPTIONAL,
 	imsi			[1] IMSI		OPTIONAL,
@@ -2573,11 +2660,15 @@ RequestedInfo ::= SEQUENCE {
 	imei			[6] NULL		OPTIONAL,
 	ms-classmark	[5] NULL		OPTIONAL,
 	mnpRequestedInfo	[7] NULL 		OPTIONAL,
+	locationInformationEPS-Supported	[11] NULL 	OPTIONAL,
 	t-adsData		[8] NULL		OPTIONAL,
 	requestedNodes	[9] RequestedNodes	OPTIONAL,
-	servingNodeIndication	[10] NULL		OPTIONAL }
+	servingNodeIndication	[10] NULL		OPTIONAL,
+	localTimeZoneRequest	[12] NULL		OPTIONAL
+ }
 
---	currentLocation shall be absent if locationInformation is absent
+--	currentLocation and locationInformationEPS-Supported shall be absent if 
+--	locationInformation is absent
 --	t-adsData shall be absent in messages sent to the VLR
 --	requestedNodes shall be absent if requestedDomain is "cs-Domain"
 --	servingNodeIndication shall be absent if locationInformation is absent;
@@ -2619,10 +2710,12 @@ LocationInformation ::= SEQUENCE {
 -- if the locationinformationEPS IE is present then the cellGlobalIdOrServiceAreaIdOrLAI IE,
 -- the ageOfLocationInformation IE, the geographicalInformation IE, the geodeticInformation IE
 -- and the currentLocationRetrieved IE (outside the locationInformationEPS IE) shall be
--- absent. 
+-- absent. As an exception, both the cellGlobalIdOrServiceAreaIdOrLAI IE including an LAI and 
+-- the locationinformationEPS IE may be present in a MAP-NOTE-MM-EVENT.
 -- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in
 -- the case the Access mode is Hybrid Mode.
-
+-- The locationInformationEPS IE should be absent if locationInformationEPS-Supported was not
+-- received in the RequestedInfo IE.
 
 LocationInformationEPS ::= SEQUENCE {
 	e-utranCellGlobalIdentity	[0] E-UTRAN-CGI		OPTIONAL,
@@ -3084,7 +3177,10 @@ ModificationRequestFor-CSI ::= SEQUENCE {
 ModificationRequestFor-IP-SM-GW-Data ::= SEQUENCE {
 	modifyRegistrationStatus	[0]	ModificationInstruction	OPTIONAL,
 	extensionContainer	[1]	ExtensionContainer	OPTIONAL,
-	...}
+	...,
+	ip-sm-gw-DiameterAddress	[2]	NetworkNodeDiameterAddress 	OPTIONAL
+	-- ip-sm-gw-DiameterAddress may be present when ModificationInstruction is "activate"
+	}
 
 ModificationInstruction ::= ENUMERATED {
 	deactivate	(0),
@@ -3154,4 +3250,30 @@ Ext-CallBarringInfoFor-CSE ::= SEQUENCE {
 	extensionContainer	[5]	ExtensionContainer 	OPTIONAL,
 	...}
 
+-- vcsg location registration types
+
+UpdateVcsgLocationArg ::= SEQUENCE {
+	imsi			IMSI,
+	msisdn		[2] ISDN-AddressString	OPTIONAL,
+	vlr-Number	[0] ISDN-AddressString	OPTIONAL,
+	sgsn-Number	[1] ISDN-AddressString	OPTIONAL,
+	extensionContainer	ExtensionContainer	OPTIONAL,
+	... }
+
+UpdateVcsgLocationRes ::= SEQUENCE {
+	temporaryEmptySubscriptiondataIndicator	NULL		OPTIONAL,
+	extensionContainer	ExtensionContainer	OPTIONAL,
+	... }
+
+CancelVcsgLocationArg ::= SEQUENCE {
+	identity		Identity,
+	extensionContainer	ExtensionContainer	OPTIONAL,
+	...
+	 }
+
+CancelVcsgLocationRes ::= SEQUENCE {
+	extensionContainer	ExtensionContainer	OPTIONAL,
+	... }
+
+
 END
diff --git a/asn1/gsm_map/MAP-MobileServiceOperations.asn b/asn1/gsm_map/MAP-MobileServiceOperations.asn
index 19213aaedf..f741fce02b 100644
--- a/asn1/gsm_map/MAP-MobileServiceOperations.asn
+++ b/asn1/gsm_map/MAP-MobileServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09) 
+-- 3GPP TS 29.002 V11.5.0 (2012-12) 
 -- 17.6.1	Mobile Service Operations
 
 MAP-MobileServiceOperations {
@@ -24,6 +24,10 @@ EXPORTS
 	-- gprs location registration operations
 	updateGprsLocation,
 
+	-- vcsg location registration operations
+	updateVcsgLocation,
+	cancelVcsgLocation,
+
 	-- subscriber information enquiry operations
 	provideSubscriberInfo,
 
@@ -122,6 +126,10 @@ FROM MAP-Errors {
 	SendIdentificationRes, 
 	UpdateGprsLocationArg,
 	UpdateGprsLocationRes,
+	UpdateVcsgLocationArg,
+	UpdateVcsgLocationRes, 
+	CancelVcsgLocationArg,
+	CancelVcsgLocationRes,
 	PrepareHO-Arg,
 	PrepareHO-Res,
 ForwardAccessSignalling-Arg,
@@ -508,4 +516,28 @@ noteMM-Event  OPERATION ::= {				--Timer m
 		mm-EventNotSupported}
 	CODE	local:89 }
 
+-- vcsg location registration operations
+
+updateVcsgLocation  OPERATION ::= {				--Timer m
+	ARGUMENT
+		UpdateVcsgLocationArg
+	RESULT
+		UpdateVcsgLocationRes
+	ERRORS {
+		systemFailure |
+		unexpectedDataValue |
+		unknownSubscriber}
+	CODE	local:53 }
+
+cancelVcsgLocation  OPERATION ::= {				--Timer m
+	ARGUMENT
+		CancelVcsgLocationArg
+	RESULT
+		CancelVcsgLocationRes
+			-- optional
+	ERRORS {
+		dataMissing |
+		unexpectedDataValue}
+	CODE	local:36 }
+
 END
diff --git a/asn1/gsm_map/MAP-OM-DataTypes.asn b/asn1/gsm_map/MAP-OM-DataTypes.asn
index 27e6133db2..7c43d35e37 100644
--- a/asn1/gsm_map/MAP-OM-DataTypes.asn
+++ b/asn1/gsm_map/MAP-OM-DataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 -- 17.7.2	Operation and maintenance data types
--- 3GPP TS 29.002 V10.4.0 (2011-09)
+-- 3GPP TS 29.002 V11.5.0 (2012-12)
  
 MAP-OM-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -193,7 +193,23 @@ TraceDepthList ::= SEQUENCE {
 	mme-TraceDepth	[6] TraceDepth	OPTIONAL,
 	sgw-TraceDepth	[7] TraceDepth	OPTIONAL,
 	pgw-TraceDepth	[8] TraceDepth	OPTIONAL,
-	eNB-TraceDepth	[9] TraceDepth	OPTIONAL }
+	eNB-TraceDepth	[9] TraceDepth	OPTIONAL,
+	msc-s-TraceDepthExtension	[10] TraceDepthExtension	OPTIONAL,
+	mgw-TraceDepthExtension	[11] TraceDepthExtension	OPTIONAL,
+	sgsn-TraceDepthExtension	[12] TraceDepthExtension	OPTIONAL,
+	ggsn-TraceDepthExtension	[13] TraceDepthExtension	OPTIONAL,
+	rnc-TraceDepthExtension	[14] TraceDepthExtension	OPTIONAL,
+	bmsc-TraceDepthExtension	[15] TraceDepthExtension	OPTIONAL,
+	mme-TraceDepthExtension	[16] TraceDepthExtension	OPTIONAL,
+	sgw-TraceDepthExtension	[17] TraceDepthExtension	OPTIONAL,
+	pgw-TraceDepthExtension	[18] TraceDepthExtension	OPTIONAL,
+	eNB-TraceDepthExtension	[19] TraceDepthExtension	OPTIONAL }
+
+-- If one of the TraceDepthExtension types is sent, the corresponding TraceDepth type
+-- shall also be sent with the same enumeration value to allow the receiver not supporting
+-- the Extension to fall back to the non extended type.
+-- If one of the TraceDepthExtension types is received and supported, the corresponding
+-- TraceDepth type shall be ignored.
 
 TraceDepth ::= ENUMERATED {
 	minimum (0),
@@ -203,6 +219,15 @@ TraceDepth ::= ENUMERATED {
 -- The value medium is applicable only for RNC. For other network elements, if value medium
 -- is received, value minimum shall be applied.
 
+TraceDepthExtension ::= ENUMERATED {
+	minimumWithoutVendorSpecificExtension (0),
+	mediumWithoutVendorSpecificExtension (1),
+	maximumWithoutVendorSpecificExtension (2),
+	...}
+-- The value mediumWithoutVendorSpecificExtension is applicable only for RNC. For other 
+-- network elements, if value mediumWithoutVendorSpecificExtension is received, value
+-- minimumWithoutVendorSpecificExtension shall be applied.
+
 TraceNE-TypeList ::= BIT STRING {
 	msc-s (0),
 	mgw (1),
@@ -385,7 +410,16 @@ TracePropagationList ::= SEQUENCE {
 	mgw-TraceDepth	[9] TraceDepth	OPTIONAL,
 	mgw-InterfaceList	[10] MGW-InterfaceList	OPTIONAL,
 	mgw-EventList	[11] MGW-EventList	OPTIONAL,
-	...}
+	...,
+	rnc-TraceDepthExtension	[12] TraceDepthExtension	OPTIONAL,
+	msc-s-TraceDepthExtension	[13] TraceDepthExtension	OPTIONAL,
+	mgw-TraceDepthExtension	[14] TraceDepthExtension	OPTIONAL
+}
+-- If one of the TraceDepthExtension types is sent, the corresponding TraceDepth type
+-- shall also be sent with the same enumeration value to allow the receiver not supporting
+-- the Extension to fall back to the non extended type.
+-- If one of the TraceDepthExtension types is received and supported, the corresponding
+-- TraceDepth type shall be ignored.
 
 ActivateTraceModeRes ::= SEQUENCE {
 	extensionContainer	[0] ExtensionContainer	OPTIONAL,
diff --git a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
index 1975254477..87f826033a 100644
--- a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
+++ b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09) 
+-- 3GPP TS 29.002 V11.5.0 (2012-12) 
 --17.6.2	Operation and Maintenance Operations
 MAP-OperationAndMaintenanceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
diff --git a/asn1/gsm_map/MAP-Protocol.asn b/asn1/gsm_map/MAP-Protocol.asn
index 4e5ad2ed24..62083bd6a2 100644
--- a/asn1/gsm_map/MAP-Protocol.asn
+++ b/asn1/gsm_map/MAP-Protocol.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)
+-- 3GPP TS 29.002 V11.5.0 (2012-12)
 --17.5	MAP operation and error codes
 MAP-Protocol {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -18,9 +18,11 @@ joint-iso-itu-t remote-operations(4) informationObjects(5) version1(0)}
 
 	updateLocation,
 	cancelLocation,
+	cancelVcsgLocation,
 	purgeMS,
 	sendIdentification,
 	updateGprsLocation,
+	updateVcsgLocation,
 	prepareHandover,
 	sendEndSignal,
 	processAccessSignalling,
@@ -123,15 +125,17 @@ FROM MAP-LocationServiceOperations {
 
 
 ;
-Supported-MAP-Operations OPERATION ::= {updateLocation | cancelLocation | purgeMS | 
-sendIdentification | updateGprsLocation | prepareHandover | sendEndSignal | 
+Supported-MAP-Operations OPERATION ::= {updateLocation | cancelLocation | cancelVcsgLocation | 
+purgeMS | 
+sendIdentification | updateGprsLocation | updateVcsgLocation | prepareHandover | sendEndSignal | 
 processAccessSignalling | forwardAccessSignalling | prepareSubsequentHandover | 
 sendAuthenticationInfo | authenticationFailureReport | checkIMEI | insertSubscriberData | 
 deleteSubscriberData | reset | forwardCheckSS-Indication | restoreData | provideSubscriberInfo | 
 anyTimeInterrogation | anyTimeSubscriptionInterrogation | anyTimeModification | 
 sendRoutingInfoForGprs | failureReport |noteMsPresentForGprs | noteMM-Event | 
 noteSubscriberDataModified | activateTraceMode | deactivateTraceMode | sendIMSI | 
-sendRoutingInfo | provideRoamingNumber | resumeCallHandling | setReportingState | statusReport | remoteUserFree | ist-Alert | 
+sendRoutingInfo | provideRoamingNumber | resumeCallHandling | setReportingState | statusReport | 
+remoteUserFree | ist-Alert | 
 ist-Command | registerSS | eraseSS | activateSS | deactivateSS | interrogateSS | 
 processUnstructuredSS-Request | unstructuredSS-Request | unstructuredSS-Notify | 
 registerPassword | getPassword | ss-InvocationNotification | registerCC-Entry | eraseCC-Entry | 
diff --git a/asn1/gsm_map/MAP-SM-DataTypes.asn b/asn1/gsm_map/MAP-SM-DataTypes.asn
index 45752cb18b..db881d8abb 100644
--- a/asn1/gsm_map/MAP-SM-DataTypes.asn
+++ b/asn1/gsm_map/MAP-SM-DataTypes.asn
@@ -41,7 +41,8 @@ IMPORTS
 	IMSI,
 	LMSI,
 	ASCI-CallReference,
-	Time
+	Time,
+	NetworkNodeDiameterAddress
 
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -71,7 +72,8 @@ RoutingInfoForSM-Arg ::= SEQUENCE {
 	sm-RP-MTI		[8] SM-RP-MTI	OPTIONAL,
 	sm-RP-SMEA	[9] SM-RP-SMEA	OPTIONAL,
 	sm-deliveryNotIntended	[10] SM-DeliveryNotIntended	OPTIONAL,
-	ip-sm-gwGuidanceIndicator	[11] NULL		OPTIONAL }
+	ip-sm-gwGuidanceIndicator	[11] NULL		OPTIONAL,
+	imsi			[12] IMSI		OPTIONAL }
 
 SM-DeliveryNotIntended ::= ENUMERATED {
 	onlyIMSI-requested  (0),
@@ -112,19 +114,22 @@ LocationInfoWithLMSI ::= SEQUENCE {
 	gprsNodeIndicator	[5]	NULL		OPTIONAL,
 	-- gprsNodeIndicator is set only if the SGSN number is sent as the 
 	-- Network Node Number
-	additional-Number	[6] Additional-Number	OPTIONAL 
-	-- NetworkNode-number can be either msc-number or sgsn-number or IP-SM-GW
-	-- number or SMS Router number
+	additional-Number	[6] Additional-Number	OPTIONAL,
+	networkNodeDiameterAddress	[7] NetworkNodeDiameterAddress	OPTIONAL,
+	additionalNetworkNodeDiameterAddress	[8] NetworkNodeDiameterAddress 	OPTIONAL,
+	thirdNumber	[9] Additional-Number		OPTIONAL,
+	thirdNetworkNodeDiameterAddress	[10] NetworkNodeDiameterAddress	OPTIONAL,
+	imsNodeIndicator	[11] NULL		OPTIONAL 
+	-- gprsNodeIndicator and imsNodeIndicator shall not both be present.
+	-- additionalNumber and thirdNumber shall not both contain the same type of number.
 	}
 
 Additional-Number ::= CHOICE {
 	msc-Number	[0] ISDN-AddressString,
 	sgsn-Number	[1] ISDN-AddressString}
-	-- additional-number can be either msc-number or sgsn-number
-	-- if received networkNode-number is msc-number then the 	
-	-- additional number is sgsn-number 
-	-- if received networkNode-number is sgsn-number then the 
-	-- additional number is msc-number 
+	-- msc-number can be the MSC number or 
+	-- the SMS Router number or the MME number for MT SMS
+	-- sgsn-number can be the SGSN number or the SMS Router number 
 
 MO-ForwardSM-Arg ::= SEQUENCE {
 	sm-RP-DA		SM-RP-DA,
@@ -147,7 +152,8 @@ MT-ForwardSM-Arg ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...,
 	smDeliveryTimer	SM-DeliveryTimerValue	OPTIONAL,
-	smDeliveryStartTime	Time			OPTIONAL }
+	smDeliveryStartTime	Time			OPTIONAL,
+	smsOverIP-OnlyIndicator	[0] NULL		OPTIONAL }
 	-- SM-DeliveryTimerValue contains the value used by the SMS-GMSC
 
 MT-ForwardSM-Res ::= SEQUENCE {
@@ -196,10 +202,11 @@ ReportSM-DeliveryStatusArg ::= SEQUENCE {
 	ip-sm-gw-sm-deliveryOutcome	[7] 	SM-DeliveryOutcome	OPTIONAL, 
 	-- If received ip-sm-gw-sm-deliveryOutcome is for delivery via IMS
 	-- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-deliveryOutcome shall be absent
-	ip-sm-gw-absentSubscriberDiagnosticSM	[8]	AbsentSubscriberDiagnosticSM	OPTIONAL
+	ip-sm-gw-absentSubscriberDiagnosticSM	[8]	AbsentSubscriberDiagnosticSM	OPTIONAL,
 	-- If received ip-sm-gw-sm-absentSubscriberDiagnosticSM is for delivery via IMS
 	-- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-absentSubscriberDiagnosticSM 
 	-- shall be absent
+	imsi			[9] IMSI		OPTIONAL
 }
 
 SM-DeliveryOutcome ::= ENUMERATED {
@@ -215,7 +222,8 @@ ReportSM-DeliveryStatusRes ::= SEQUENCE {
 AlertServiceCentreArg ::= SEQUENCE {
 	msisdn		ISDN-AddressString,
 	serviceCentreAddress	AddressString,
-	...}
+	...,
+	imsi			IMSI			OPTIONAL }
 
 InformServiceCentreArg ::= SEQUENCE {
 	storedMSISDN	ISDN-AddressString	OPTIONAL,
@@ -270,7 +278,10 @@ MT-ForwardSM-VGCS-Res ::= SEQUENCE {
 	dispatcherList	[1] DispatcherList	OPTIONAL,
 	ongoingCall	NULL			OPTIONAL,
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
-	...}
+	...,
+	additionalDispatcherList	[3] AdditionalDispatcherList	OPTIONAL }
+	-- additionalDispatcherList shall be absent if dispatcherList is absent or 
+	-- contains less than 5 ISDN-AddressStrings
 
 DispatcherList ::= 
 	SEQUENCE SIZE (1..maxNumOfDispatchers) OF
@@ -278,6 +289,11 @@ DispatcherList ::=
 
 maxNumOfDispatchers  INTEGER ::= 5
 
+AdditionalDispatcherList ::= 
+	SEQUENCE SIZE (1..maxNumOfAdditionalDispatchers) OF
+				ISDN-AddressString
+
+maxNumOfAdditionalDispatchers  INTEGER ::= 15
 
 
 END
diff --git a/asn1/gsm_map/MAP-SS-Code.asn b/asn1/gsm_map/MAP-SS-Code.asn
index 7c58e527e5..0c3d4b701a 100644
--- a/asn1/gsm_map/MAP-SS-Code.asn
+++ b/asn1/gsm_map/MAP-SS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)
+-- 3GPP TS 29.002 V11.5.0 (2012-12)
 -- 17.7.5	Supplementary service codes
 
 MAP-SS-Code {
diff --git a/asn1/gsm_map/MAP-SS-DataTypes.asn b/asn1/gsm_map/MAP-SS-DataTypes.asn
index 5f17189c8a..e64acffba5 100644
--- a/asn1/gsm_map/MAP-SS-DataTypes.asn
+++ b/asn1/gsm_map/MAP-SS-DataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)
+-- 3GPP TS 29.002 V11.5.0 (2012-12)
 -- 17.7.4	Supplementary service data types
  
 MAP-SS-DataTypes {
diff --git a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
index f80e44f386..121507a96c 100644
--- a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
+++ b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)  
+-- 3GPP TS 29.002 V11.5.0 (2012-12)  
 -- 17.6.5	Short message service operations
  
 MAP-ShortMessageServiceOperations {
diff --git a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
index e7fe3eae88..65bc47ed05 100644
--- a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
+++ b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09)  
+-- 3GPP TS 29.002 V11.5.0 (2012-12)  
 --17.6.4	Supplementary service operations
 
 MAP-SupplementaryServiceOperations {
diff --git a/asn1/gsm_map/MAP-TS-Code.asn b/asn1/gsm_map/MAP-TS-Code.asn
index 1e0bf58409..2e62040286 100644
--- a/asn1/gsm_map/MAP-TS-Code.asn
+++ b/asn1/gsm_map/MAP-TS-Code.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V10.4.0 (2011-09) 
+-- 3GPP TS 29.002 V11.5.0 (2012-12) 
 -- 17.7.9	Teleservice Codes
  
 MAP-TS-Code {