diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn
index e285180ac41fb96369bf52081d0ffd0ca5770cad..a94056ebeb5a0d337c49c77f80c7c7d2f97e3835 100644
--- a/102232-1/LI-PS-PDU.asn
+++ b/102232-1/LI-PS-PDU.asn
@@ -1,5 +1,5 @@
 LI-PS-PDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version16(16)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 
@@ -25,16 +25,17 @@ IMPORTS
 	EmailCC,
 	EmailIRI,
 	MessagingCC,
+	MessagingMMCC,
 	MessagingIRI
 		FROM EmailPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}
 
 	-- from TS 102 232-03 [6]
 	IPCC,
 	IPIRI,
 	IPIRIOnly
 		FROM IPAccessPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)}
 
 	-- from TS 102 232-04 [32]
 	L2CC,
@@ -128,7 +129,7 @@ IMPORTS
 
 lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
 
-li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version16(16)}
+li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)}
 
 -- ====================
 -- Top-level definition
@@ -173,7 +174,8 @@ TimeStampQualifier ::= ENUMERATED
 	unknown(0),
 	timeOfInterception(1),
 	timeOfMediation(2),
-	...
+	...,
+	timeOfAggregation(3)
 }
 
 -- ====================================
@@ -214,8 +216,9 @@ CCPayload ::= SEQUENCE
 		-- For aggregated payloads (see clause 6.2.3)
 	cCContents				[2] CCContents,
 	...,
-	microSecondTimeStamp	[3] MicroSecondTimeStamp OPTIONAL
+	microSecondTimeStamp	[3] MicroSecondTimeStamp OPTIONAL,
 		-- For aggregated payloads (see clause 6.2.3)
+	timeStampQualifier		[4] TimeStampQualifier OPTIONAL
 }
 
 PayloadDirection ::= ENUMERATED
@@ -251,7 +254,8 @@ CCContents ::= CHOICE
 	messagingCC			[14] MessagingCC,
 	ePSCC				[15] OCTET STRING,
 	uMTSCC-CC-PDU			[16] Umts-HI3-PS.CC-PDU,
-	ePSCC-CC-PDU			[17] Eps-HI3-PS.CC-PDU
+	ePSCC-CC-PDU			[17] Eps-HI3-PS.CC-PDU,
+	messagingMMCC		[18] MessagingMMCC
 }
 
 MicroSecondTimeStamp ::= SEQUENCE
@@ -273,7 +277,10 @@ IRIPayload ::= SEQUENCE
 	timeStamp		[1] GeneralizedTime OPTIONAL,
 		-- For aggregated payloads (see clause 6.2.3)
 	iRIContents		[2] IRIContents,
-	...
+	...,
+	microSecondTimeStamp	[3] MicroSecondTimeStamp OPTIONAL,
+		-- For aggregated payloads (see clause 6.2.3)
+	timeStampQualifier		[4] TimeStampQualifier OPTIONAL
 }
 
 IRIType ::= ENUMERATED
@@ -337,17 +344,22 @@ EPSIRI ::= CHOICE
 
 TRIPayload ::= CHOICE
 {
-	integrityCheck		[0] IntegrityCheck,
-	testPDU				[1] NULL,
-	paddingPDU			[2] OCTET STRING,
+	integrityCheck				[0] IntegrityCheck,
+	testPDU						[1] NULL,
+	paddingPDU					[2] OCTET STRING,
 		-- Undefined contents (will be discarded)
-	keep-alive			[3] NULL,
-	keep-aliveResponse	[4] NULL,
-	firstSegmentFlag	[5] NULL,
-	lastSegmentFlag		[6] NULL,
+	keep-alive					[3] NULL,
+	keep-aliveResponse			[4] NULL,
+	firstSegmentFlag			[5] NULL,
+	lastSegmentFlag				[6] NULL,
 	...,
-	cINReset			[7] NULL,
-	operatorLeaMessage	[8] OperatorLeaMessage
+	cINReset					[7] NULL,
+	operatorLeaMessage			[8] OperatorLeaMessage,
+	optionRequest				[9] OptionRequest,
+	optionResponse				[10] OptionResponse,
+	optionComplete				[11] NULL,
+	pDUAcknowledgementRequest	[12] NULL,
+	pDUAcknowledgementResponse	[13] NULL
 }
 
 IntegrityCheck ::= SEQUENCE
@@ -380,6 +392,25 @@ DataType ::= ENUMERATED
 	...
 }
 
+Option ::= CHOICE
+{
+	pDUAcknowledgement	[0] NULL,
+	...
+}
+
+OptionRequest ::= SEQUENCE
+{
+	requestedOptions	[0] SEQUENCE OF Option,
+	...
+}
+
+OptionResponse ::= SEQUENCE
+{
+	acceptedOptions		[0] SEQUENCE OF Option,
+	declinedOptions		[1] SEQUENCE OF Option,
+	...
+}
+
 -- ==================================
 -- Definitions for OperatorLeaMessage
 -- ==================================
@@ -472,4 +503,3 @@ EncryptedPayloadType ::= ENUMERATED
 }
 
 END --end of LI-PS-PDU
-
diff --git a/102232-1/portal/LI-PS-PDU,ver16,1.txt b/102232-1/portal/LI-PS-PDU,ver17.txt
similarity index 90%
rename from 102232-1/portal/LI-PS-PDU,ver16,1.txt
rename to 102232-1/portal/LI-PS-PDU,ver17.txt
index e285180ac41fb96369bf52081d0ffd0ca5770cad..a94056ebeb5a0d337c49c77f80c7c7d2f97e3835 100644
--- a/102232-1/portal/LI-PS-PDU,ver16,1.txt
+++ b/102232-1/portal/LI-PS-PDU,ver17.txt
@@ -1,5 +1,5 @@
 LI-PS-PDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version16(16)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 
@@ -25,16 +25,17 @@ IMPORTS
 	EmailCC,
 	EmailIRI,
 	MessagingCC,
+	MessagingMMCC,
 	MessagingIRI
 		FROM EmailPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}
 
 	-- from TS 102 232-03 [6]
 	IPCC,
 	IPIRI,
 	IPIRIOnly
 		FROM IPAccessPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)}
 
 	-- from TS 102 232-04 [32]
 	L2CC,
@@ -128,7 +129,7 @@ IMPORTS
 
 lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
 
-li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version16(16)}
+li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)}
 
 -- ====================
 -- Top-level definition
@@ -173,7 +174,8 @@ TimeStampQualifier ::= ENUMERATED
 	unknown(0),
 	timeOfInterception(1),
 	timeOfMediation(2),
-	...
+	...,
+	timeOfAggregation(3)
 }
 
 -- ====================================
@@ -214,8 +216,9 @@ CCPayload ::= SEQUENCE
 		-- For aggregated payloads (see clause 6.2.3)
 	cCContents				[2] CCContents,
 	...,
-	microSecondTimeStamp	[3] MicroSecondTimeStamp OPTIONAL
+	microSecondTimeStamp	[3] MicroSecondTimeStamp OPTIONAL,
 		-- For aggregated payloads (see clause 6.2.3)
+	timeStampQualifier		[4] TimeStampQualifier OPTIONAL
 }
 
 PayloadDirection ::= ENUMERATED
@@ -251,7 +254,8 @@ CCContents ::= CHOICE
 	messagingCC			[14] MessagingCC,
 	ePSCC				[15] OCTET STRING,
 	uMTSCC-CC-PDU			[16] Umts-HI3-PS.CC-PDU,
-	ePSCC-CC-PDU			[17] Eps-HI3-PS.CC-PDU
+	ePSCC-CC-PDU			[17] Eps-HI3-PS.CC-PDU,
+	messagingMMCC		[18] MessagingMMCC
 }
 
 MicroSecondTimeStamp ::= SEQUENCE
@@ -273,7 +277,10 @@ IRIPayload ::= SEQUENCE
 	timeStamp		[1] GeneralizedTime OPTIONAL,
 		-- For aggregated payloads (see clause 6.2.3)
 	iRIContents		[2] IRIContents,
-	...
+	...,
+	microSecondTimeStamp	[3] MicroSecondTimeStamp OPTIONAL,
+		-- For aggregated payloads (see clause 6.2.3)
+	timeStampQualifier		[4] TimeStampQualifier OPTIONAL
 }
 
 IRIType ::= ENUMERATED
@@ -337,17 +344,22 @@ EPSIRI ::= CHOICE
 
 TRIPayload ::= CHOICE
 {
-	integrityCheck		[0] IntegrityCheck,
-	testPDU				[1] NULL,
-	paddingPDU			[2] OCTET STRING,
+	integrityCheck				[0] IntegrityCheck,
+	testPDU						[1] NULL,
+	paddingPDU					[2] OCTET STRING,
 		-- Undefined contents (will be discarded)
-	keep-alive			[3] NULL,
-	keep-aliveResponse	[4] NULL,
-	firstSegmentFlag	[5] NULL,
-	lastSegmentFlag		[6] NULL,
+	keep-alive					[3] NULL,
+	keep-aliveResponse			[4] NULL,
+	firstSegmentFlag			[5] NULL,
+	lastSegmentFlag				[6] NULL,
 	...,
-	cINReset			[7] NULL,
-	operatorLeaMessage	[8] OperatorLeaMessage
+	cINReset					[7] NULL,
+	operatorLeaMessage			[8] OperatorLeaMessage,
+	optionRequest				[9] OptionRequest,
+	optionResponse				[10] OptionResponse,
+	optionComplete				[11] NULL,
+	pDUAcknowledgementRequest	[12] NULL,
+	pDUAcknowledgementResponse	[13] NULL
 }
 
 IntegrityCheck ::= SEQUENCE
@@ -380,6 +392,25 @@ DataType ::= ENUMERATED
 	...
 }
 
+Option ::= CHOICE
+{
+	pDUAcknowledgement	[0] NULL,
+	...
+}
+
+OptionRequest ::= SEQUENCE
+{
+	requestedOptions	[0] SEQUENCE OF Option,
+	...
+}
+
+OptionResponse ::= SEQUENCE
+{
+	acceptedOptions		[0] SEQUENCE OF Option,
+	declinedOptions		[1] SEQUENCE OF Option,
+	...
+}
+
 -- ==================================
 -- Definitions for OperatorLeaMessage
 -- ==================================
@@ -472,4 +503,3 @@ EncryptedPayloadType ::= ENUMERATED
 }
 
 END --end of LI-PS-PDU
-