diff --git a/v3_17_0/CDT-AE-v3_17_0.xsd b/v3_17_0/CDT-AE-v3_17_0.xsd
index efd81d6d6caa46b2b3ecb0a08624ecc1749f54ec..9f711c9c7f3966b967fa4bf138fc1cbdbe8e565f 100644
--- a/v3_17_0/CDT-AE-v3_17_0.xsd
+++ b/v3_17_0/CDT-AE-v3_17_0.xsd
@@ -26,20 +26,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-AEContactList-v3_17_0.xsd b/v3_17_0/CDT-AEContactList-v3_17_0.xsd
index 36288571f4c7122fecb3ff0ae13f0132d1590c9c..eb382f041077cb0ef66f2ec3f5416ff18d301c02 100644
--- a/v3_17_0/CDT-AEContactList-v3_17_0.xsd
+++ b/v3_17_0/CDT-AEContactList-v3_17_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-AEContactListPerCSE-v3_17_0.xsd b/v3_17_0/CDT-AEContactListPerCSE-v3_17_0.xsd
index 6e936bd0d47293fb89be8f5ef119560f18076e7b..0dfccf1c434dc338e30373fbe1a804a030e6cf10 100644
--- a/v3_17_0/CDT-AEContactListPerCSE-v3_17_0.xsd
+++ b/v3_17_0/CDT-AEContactListPerCSE-v3_17_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-CSEBase-v3_17_0.xsd b/v3_17_0/CDT-CSEBase-v3_17_0.xsd
index 68997859dadccd7720933037cfd78d062849498a..a827121be3b885236a7c2d6c4999b2579310a614 100644
--- a/v3_17_0/CDT-CSEBase-v3_17_0.xsd
+++ b/v3_17_0/CDT-CSEBase-v3_17_0.xsd
@@ -26,38 +26,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_16_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_16_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_16_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_17_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_17_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_17_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-accessControlPolicy-v3_17_0.xsd b/v3_17_0/CDT-accessControlPolicy-v3_17_0.xsd
index d9817e28bdb22d7ce2af9fa70f2542ae4df4602e..313789c90a3fce95077e4a8ec7501be3a3acbb01 100644
--- a/v3_17_0/CDT-accessControlPolicy-v3_17_0.xsd
+++ b/v3_17_0/CDT-accessControlPolicy-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-activeCmdhPolicy-v3_17_0.xsd b/v3_17_0/CDT-activeCmdhPolicy-v3_17_0.xsd
index f41d53e6cf70309bbcb9aa8f1cdc8e2dbd82789f..b6ce2729f0487980bac8f9b365b5e7a0b11bcf6e 100644
--- a/v3_17_0/CDT-activeCmdhPolicy-v3_17_0.xsd
+++ b/v3_17_0/CDT-activeCmdhPolicy-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_17_0/CDT-allJoynApp-v3_17_0.xsd b/v3_17_0/CDT-allJoynApp-v3_17_0.xsd
index e6e358cb482a31e57e78f07b439b0561ef99b6b7..76a81790d1d358dbd469bad14573b8c7a590133e 100644
--- a/v3_17_0/CDT-allJoynApp-v3_17_0.xsd
+++ b/v3_17_0/CDT-allJoynApp-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_17_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-allJoynInterface-v3_17_0.xsd b/v3_17_0/CDT-allJoynInterface-v3_17_0.xsd
index bc2a52b487c0b90210f22717810dbe564dcc1a7d..5d5e12ee25abe077628221220c802564150e1faa 100644
--- a/v3_17_0/CDT-allJoynInterface-v3_17_0.xsd
+++ b/v3_17_0/CDT-allJoynInterface-v3_17_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_17_0/CDT-allJoynMethod-v3_17_0.xsd b/v3_17_0/CDT-allJoynMethod-v3_17_0.xsd
index a6225cd3295b127cec448e34db6fbf0b3cd58664..3aa875d91581cdd8eda144d6ac3180e5d93ff5fa 100644
--- a/v3_17_0/CDT-allJoynMethod-v3_17_0.xsd
+++ b/v3_17_0/CDT-allJoynMethod-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_17_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_17_0/CDT-allJoynMethodCall-v3_17_0.xsd b/v3_17_0/CDT-allJoynMethodCall-v3_17_0.xsd
index c866c65a6710ec5b2a717d7b3c225a5db3872152..c3423841816d659228d1688b900bfff9455f9dba 100644
--- a/v3_17_0/CDT-allJoynMethodCall-v3_17_0.xsd
+++ b/v3_17_0/CDT-allJoynMethodCall-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-allJoynProperty-v3_17_0.xsd b/v3_17_0/CDT-allJoynProperty-v3_17_0.xsd
index e9f208e9d418677ac8b94ccc268879f0cb7cc8dc..1301f111b64039e8f048360cc89e102ff6d5e5e6 100644
--- a/v3_17_0/CDT-allJoynProperty-v3_17_0.xsd
+++ b/v3_17_0/CDT-allJoynProperty-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-allJoynSvcObject-v3_17_0.xsd b/v3_17_0/CDT-allJoynSvcObject-v3_17_0.xsd
index 94ec065a7e86d037721ba386b1847768c3b27be1..46acee083cc34a199a9240a7fb4d2be7fd707a41 100644
--- a/v3_17_0/CDT-allJoynSvcObject-v3_17_0.xsd
+++ b/v3_17_0/CDT-allJoynSvcObject-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_17_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-areaNwkDeviceInfo-v3_17_0.xsd b/v3_17_0/CDT-areaNwkDeviceInfo-v3_17_0.xsd
index 3f82ad627c294310a43c12715d169854951c17ac..4ed66d186338704541a472a0a0df599f20ced715 100644
--- a/v3_17_0/CDT-areaNwkDeviceInfo-v3_17_0.xsd
+++ b/v3_17_0/CDT-areaNwkDeviceInfo-v3_17_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-areaNwkInfo-v3_17_0.xsd b/v3_17_0/CDT-areaNwkInfo-v3_17_0.xsd
index 325c70b3308382c00016ae1e36075712366c0f06..2f1b79ebe46f65013279bf49f85ba78e50c4db42 100644
--- a/v3_17_0/CDT-areaNwkInfo-v3_17_0.xsd
+++ b/v3_17_0/CDT-areaNwkInfo-v3_17_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-authorizationDecision-v3_17_0.xsd b/v3_17_0/CDT-authorizationDecision-v3_17_0.xsd
index 37ee66956b2534d14489c3cbe8ed9cf763eff204..c76367bb3f18f8f9e7b02071aba2c00389d8ca8c 100644
--- a/v3_17_0/CDT-authorizationDecision-v3_17_0.xsd
+++ b/v3_17_0/CDT-authorizationDecision-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-authorizationInformation-v3_17_0.xsd b/v3_17_0/CDT-authorizationInformation-v3_17_0.xsd
index 3b1bf5161934dda93eacea0dd1eeb0fc1dccb385..fa06e793fd90e0b0e5999d2d6c63174fa40e90c8 100644
--- a/v3_17_0/CDT-authorizationInformation-v3_17_0.xsd
+++ b/v3_17_0/CDT-authorizationInformation-v3_17_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-authorizationPolicy-v3_17_0.xsd b/v3_17_0/CDT-authorizationPolicy-v3_17_0.xsd
index a04277311a35f0ad24e6794f24a9e4103baee274..27969753dc50735b4c79c6ff7c6ea4014c7ba1b5 100644
--- a/v3_17_0/CDT-authorizationPolicy-v3_17_0.xsd
+++ b/v3_17_0/CDT-authorizationPolicy-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-backgroundDataTransfer-v3_17_0.xsd b/v3_17_0/CDT-backgroundDataTransfer-v3_17_0.xsd
index 83d6413a351d1e7e4e699fb865d3d056466878bb..0eae8b571d99ffb48de76ccde3c50be52dea5472 100644
--- a/v3_17_0/CDT-backgroundDataTransfer-v3_17_0.xsd
+++ b/v3_17_0/CDT-backgroundDataTransfer-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-battery-v3_17_0.xsd b/v3_17_0/CDT-battery-v3_17_0.xsd
index 23997ff684b4592addb9955b84073d9537266e2e..48e946409d19a14f631ab334a63fdc50b623862a 100644
--- a/v3_17_0/CDT-battery-v3_17_0.xsd
+++ b/v3_17_0/CDT-battery-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-cmdhBuffer-v3_17_0.xsd b/v3_17_0/CDT-cmdhBuffer-v3_17_0.xsd
index 65a56d7b50fb45e163823a29c1f7f26a90daafdd..3d65e1d8f4e2007c412ecd52b84ec700070ae46b 100644
--- a/v3_17_0/CDT-cmdhBuffer-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhBuffer-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_17_0/CDT-cmdhDefEcValue-v3_17_0.xsd b/v3_17_0/CDT-cmdhDefEcValue-v3_17_0.xsd
index b3165ab456d80a035040745f1af96525f7c40eee..0f8d71f3626c93002f6eae46d990956bf9e44fdc 100644
--- a/v3_17_0/CDT-cmdhDefEcValue-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhDefEcValue-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_17_0/CDT-cmdhDefaults-v3_17_0.xsd b/v3_17_0/CDT-cmdhDefaults-v3_17_0.xsd
index 307cd03d13ea66ec4b09b37c62953d71c6737ad2..cf54c694b0cc98f965ab0f3b45831f7a8d753ac5 100644
--- a/v3_17_0/CDT-cmdhDefaults-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhDefaults-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_17_0/CDT-cmdhEcDefParamValues-v3_17_0.xsd b/v3_17_0/CDT-cmdhEcDefParamValues-v3_17_0.xsd
index 63b48f979209f37067e655a579f2188a122ec23b..e9a5d7b434190b0e6709de692ff74d7808f6e703 100644
--- a/v3_17_0/CDT-cmdhEcDefParamValues-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhEcDefParamValues-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_17_0/CDT-cmdhLimits-v3_17_0.xsd b/v3_17_0/CDT-cmdhLimits-v3_17_0.xsd
index 6ac5df1c7d849a22492abdea594b1d07d19f0263..bbb4d593519ff8d8bc079dc0f26e8102d8649a0a 100644
--- a/v3_17_0/CDT-cmdhLimits-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhLimits-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_17_0/CDT-cmdhNetworkAccessRules-v3_17_0.xsd b/v3_17_0/CDT-cmdhNetworkAccessRules-v3_17_0.xsd
index 5b73ee11473fc0ce3a7fd1debcc8e71fe99a1e55..5701572d0ca4939540b42575c42dae8438506b77 100644
--- a/v3_17_0/CDT-cmdhNetworkAccessRules-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhNetworkAccessRules-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_17_0/CDT-cmdhNwAccessRule-v3_17_0.xsd b/v3_17_0/CDT-cmdhNwAccessRule-v3_17_0.xsd
index 88261c5ab0f7d9714a28a1371e7dcde3392abb14..3995694d86c4b4a07a0ed50966817446db0b2c6b 100644
--- a/v3_17_0/CDT-cmdhNwAccessRule-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhNwAccessRule-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_17_0/CDT-cmdhPolicy-v3_17_0.xsd b/v3_17_0/CDT-cmdhPolicy-v3_17_0.xsd
index b3baba65c50856eb3bcfe7369c85e0272f7f3622..9221b30432fd2b9eae192912d9547442a9d5b21c 100644
--- a/v3_17_0/CDT-cmdhPolicy-v3_17_0.xsd
+++ b/v3_17_0/CDT-cmdhPolicy-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_17_0/CDT-commonTypes-v3_17_0.xsd b/v3_17_0/CDT-commonTypes-v3_17_0.xsd
index cb467432f434c18e2e442ba641a5abdd48918169..4b949794155fab818b701abab1320a840d15c484 100644
--- a/v3_17_0/CDT-commonTypes-v3_17_0.xsd
+++ b/v3_17_0/CDT-commonTypes-v3_17_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_17_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_17_0/CDT-container-v3_17_0.xsd b/v3_17_0/CDT-container-v3_17_0.xsd
index 2a0695aac01a58f44d2511c2c20856466c5caf77..599051e5e2139cf3d18d5600d2803dfb854e83a5 100644
--- a/v3_17_0/CDT-container-v3_17_0.xsd
+++ b/v3_17_0/CDT-container-v3_17_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_17_0/CDT-contentInstance-v3_17_0.xsd b/v3_17_0/CDT-contentInstance-v3_17_0.xsd
index 228989556fce77e379803022033ee7d8f294e24e..5268540c485255f4e0225fea7ab619a962c2f204 100644
--- a/v3_17_0/CDT-contentInstance-v3_17_0.xsd
+++ b/v3_17_0/CDT-contentInstance-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-crossResourceSubscription-v3_17_0.xsd b/v3_17_0/CDT-crossResourceSubscription-v3_17_0.xsd
index e5a05cd48623ecadc350c3888d1785f051dcf6ad..03565d562506019ddbd7df665179fadc9c407937 100644
--- a/v3_17_0/CDT-crossResourceSubscription-v3_17_0.xsd
+++ b/v3_17_0/CDT-crossResourceSubscription-v3_17_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-delivery-v3_17_0.xsd b/v3_17_0/CDT-delivery-v3_17_0.xsd
index e00c42d81598ea9d429cab195d63618425718af5..96343949bb932bb3a93b8c7976649c361650f509 100644
--- a/v3_17_0/CDT-delivery-v3_17_0.xsd
+++ b/v3_17_0/CDT-delivery-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_17_0/CDT-deviceCapability-v3_17_0.xsd b/v3_17_0/CDT-deviceCapability-v3_17_0.xsd
index 4b9a4193673c4a53ff3aeb2baee10a2bf764824e..299c4f6b5ee9db640f4aaf9e885246e488c44154 100644
--- a/v3_17_0/CDT-deviceCapability-v3_17_0.xsd
+++ b/v3_17_0/CDT-deviceCapability-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-deviceInfo-v3_17_0.xsd b/v3_17_0/CDT-deviceInfo-v3_17_0.xsd
index bd6d7346d984790df53615267bd3fa3800aadb22..b3adf147e9ab0dbd785d046f5f90cb60d49da8e4 100644
--- a/v3_17_0/CDT-deviceInfo-v3_17_0.xsd
+++ b/v3_17_0/CDT-deviceInfo-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-dynamicAuthorizationConsultation-v3_17_0.xsd b/v3_17_0/CDT-dynamicAuthorizationConsultation-v3_17_0.xsd
index a58f4ad435aa29de70c669109c2c805fac10795d..ab0287d2eb1c3c89c2f0ecf873e85426c7a67df9 100644
--- a/v3_17_0/CDT-dynamicAuthorizationConsultation-v3_17_0.xsd
+++ b/v3_17_0/CDT-dynamicAuthorizationConsultation-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-eventConfig-v3_17_0.xsd b/v3_17_0/CDT-eventConfig-v3_17_0.xsd
index c8156af85164d0a35c8d9f8bacd885866f5e2851..bc82ddac33ab580d3690b200ee54592993c245c6 100644
--- a/v3_17_0/CDT-eventConfig-v3_17_0.xsd
+++ b/v3_17_0/CDT-eventConfig-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-eventLog-v3_17_0.xsd b/v3_17_0/CDT-eventLog-v3_17_0.xsd
index 328fd51536fffc6a4731b3071f5cb9aa78d2044e..7c0884e84301ed8a001d6bb156b1cc6ff19f9d8b 100644
--- a/v3_17_0/CDT-eventLog-v3_17_0.xsd
+++ b/v3_17_0/CDT-eventLog-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-execInstance-v3_17_0.xsd b/v3_17_0/CDT-execInstance-v3_17_0.xsd
index d1676566e547fb66dc260b61c4429618414b7d61..555d14020c490251f989d817784bd40a7d41bfd3 100644
--- a/v3_17_0/CDT-execInstance-v3_17_0.xsd
+++ b/v3_17_0/CDT-execInstance-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-firmware-v3_17_0.xsd b/v3_17_0/CDT-firmware-v3_17_0.xsd
index a4d413f97f6d5427216d950b50dd351e53205718..fe542033513cad43f7447de6a2c24537b242b4ad 100644
--- a/v3_17_0/CDT-firmware-v3_17_0.xsd
+++ b/v3_17_0/CDT-firmware-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-genericInterworkingOperationInstance-v3_17_0.xsd b/v3_17_0/CDT-genericInterworkingOperationInstance-v3_17_0.xsd
index 93ae6ff7042c3c1b7f0f0e0085f2569544c939ba..b3f5c841437a3391726a9a7b43b3c8f915604cb9 100644
--- a/v3_17_0/CDT-genericInterworkingOperationInstance-v3_17_0.xsd
+++ b/v3_17_0/CDT-genericInterworkingOperationInstance-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-genericInterworkingService-v3_17_0.xsd b/v3_17_0/CDT-genericInterworkingService-v3_17_0.xsd
index 6f9fe9cf5510edb6050c48822860b3aa75546c6f..6cbfab056a07d3550d50f8a9283144fc6c629430 100644
--- a/v3_17_0/CDT-genericInterworkingService-v3_17_0.xsd
+++ b/v3_17_0/CDT-genericInterworkingService-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_17_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-group-v3_17_0.xsd b/v3_17_0/CDT-group-v3_17_0.xsd
index 9509022c9d6a2e4d9270e0a534e48c53cbf6cdfd..580b5b2d43fac6321212ef7ca22402fb7435117d 100644
--- a/v3_17_0/CDT-group-v3_17_0.xsd
+++ b/v3_17_0/CDT-group-v3_17_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_17_0/CDT-localMulticastGroup-v3_17_0.xsd b/v3_17_0/CDT-localMulticastGroup-v3_17_0.xsd
index 1ea862a19c692817f33afff382f21420dcc72d3b..9da57481f8f771c3b76a740e34a6ccd55c4b43a4 100644
--- a/v3_17_0/CDT-localMulticastGroup-v3_17_0.xsd
+++ b/v3_17_0/CDT-localMulticastGroup-v3_17_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_16_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_17_0/CDT-locationPolicy-v3_17_0.xsd b/v3_17_0/CDT-locationPolicy-v3_17_0.xsd
index 8504fbdbb4777367e9f6fff632b79a386a851c5c..dc136caa88d1e2d66104f8ff94ffc5b4b3804bbd 100644
--- a/v3_17_0/CDT-locationPolicy-v3_17_0.xsd
+++ b/v3_17_0/CDT-locationPolicy-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd b/v3_17_0/CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd
index 40351b17aefa3c93868e8421efaf50c06cd26b88..cbeeb975decbf7d1310b3160f84739625139107d 100644
--- a/v3_17_0/CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd
+++ b/v3_17_0/CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-memory-v3_17_0.xsd b/v3_17_0/CDT-memory-v3_17_0.xsd
index ecd442f10339af75a0dbf1ccdf719bea7085028f..22b1507ecc0ccb8b4131bcd8b2c6c545ddd29aed 100644
--- a/v3_17_0/CDT-memory-v3_17_0.xsd
+++ b/v3_17_0/CDT-memory-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-mgmtCmd-v3_17_0.xsd b/v3_17_0/CDT-mgmtCmd-v3_17_0.xsd
index a10df6cd7dff71ef5d43a18b7f92153d9caba8fd..cf5d0872c9350f3bcfba0250d8e3043e880b531e 100644
--- a/v3_17_0/CDT-mgmtCmd-v3_17_0.xsd
+++ b/v3_17_0/CDT-mgmtCmd-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-multimediaSession-v3_17_0.xsd b/v3_17_0/CDT-multimediaSession-v3_17_0.xsd
index 27bc315e9c700c2478f576c3ac76072d432fa4e9..29f4ee3431676a64c7080d68cf54b32e356e00ab 100644
--- a/v3_17_0/CDT-multimediaSession-v3_17_0.xsd
+++ b/v3_17_0/CDT-multimediaSession-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-node-v3_17_0.xsd b/v3_17_0/CDT-node-v3_17_0.xsd
index c46d9faa29efd9a310240a711ed4f4986061d687..ceaae2f19354ee77c082d5307d5b5721f04f6f9b 100644
--- a/v3_17_0/CDT-node-v3_17_0.xsd
+++ b/v3_17_0/CDT-node-v3_17_0.xsd
@@ -27,23 +27,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_17_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-notification-v3_17_0.xsd b/v3_17_0/CDT-notification-v3_17_0.xsd
index 5b09db3497b1a863acdee0a988f1a62a7126918f..4d4bf823cfc5439fc56a8b8baea6dbaf420f45e2 100644
--- a/v3_17_0/CDT-notification-v3_17_0.xsd
+++ b/v3_17_0/CDT-notification-v3_17_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_16_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_17_0/CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd b/v3_17_0/CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd
index 2df0f99bac354a5ccc804bd954f3feb6f5f653d8..8fbce9d00175acff270217cdf67af8b2b33653ef 100644
--- a/v3_17_0/CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd
+++ b/v3_17_0/CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-notificationTargetPolicy-v3_17_0.xsd b/v3_17_0/CDT-notificationTargetPolicy-v3_17_0.xsd
index fe458992a7ea5fcc0674cae61b645c5e1e6adff6..3a6a1c02c710a9230b964ffd77e20084506b42cd 100644
--- a/v3_17_0/CDT-notificationTargetPolicy-v3_17_0.xsd
+++ b/v3_17_0/CDT-notificationTargetPolicy-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-ontology-v3_17_0.xsd b/v3_17_0/CDT-ontology-v3_17_0.xsd
index 86d679bf818a6d331d037057ddac9c43a2e1b37a..ecb5c3e7b357f38893d058dfc3fe138cca5f2ce1 100644
--- a/v3_17_0/CDT-ontology-v3_17_0.xsd
+++ b/v3_17_0/CDT-ontology-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_17_0/CDT-ontologyRepository-v3_17_0.xsd b/v3_17_0/CDT-ontologyRepository-v3_17_0.xsd
index fc3a06748a942b32fa372ffc6fffae2d8d0d1976..2895ce0c8a766ba7037aba5ea5de21f7d309fb20 100644
--- a/v3_17_0/CDT-ontologyRepository-v3_17_0.xsd
+++ b/v3_17_0/CDT-ontologyRepository-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_17_0/CDT-policyDeletionRules-v3_17_0.xsd b/v3_17_0/CDT-policyDeletionRules-v3_17_0.xsd
index 6bafa87f202f70e5a8aa8cd555534c39be2d71ec..806c06170e4b7690cfc1204d8acafa54b750570b 100644
--- a/v3_17_0/CDT-policyDeletionRules-v3_17_0.xsd
+++ b/v3_17_0/CDT-policyDeletionRules-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-pollingChannel-v3_17_0.xsd b/v3_17_0/CDT-pollingChannel-v3_17_0.xsd
index 6628468b71b6823b8fbe7a059691fcbf80360358..3d2b8ddf8ed21aa51448a166622e7161e25a61cb 100644
--- a/v3_17_0/CDT-pollingChannel-v3_17_0.xsd
+++ b/v3_17_0/CDT-pollingChannel-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-reboot-v3_17_0.xsd b/v3_17_0/CDT-reboot-v3_17_0.xsd
index 81482cf10757c7732814677dd536a96eddd58e60..3dcacfb49ed3844a2d937e8a6abba69900f35f2d 100644
--- a/v3_17_0/CDT-reboot-v3_17_0.xsd
+++ b/v3_17_0/CDT-reboot-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-remoteCSE-v3_17_0.xsd b/v3_17_0/CDT-remoteCSE-v3_17_0.xsd
index 4e53980b4ccd184e9138202db28f53828d28510b..d6c71481e0aa8751ac22f381eebe2f83ed2aef2c 100644
--- a/v3_17_0/CDT-remoteCSE-v3_17_0.xsd
+++ b/v3_17_0/CDT-remoteCSE-v3_17_0.xsd
@@ -26,22 +26,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-request-v3_17_0.xsd b/v3_17_0/CDT-request-v3_17_0.xsd
index 9dd64c4dbdbaca06e9abeef105cde0bd2ffcaec8..77b7ca0ba95713748e91ee7f4bb9270fe3aaaf3d 100644
--- a/v3_17_0/CDT-request-v3_17_0.xsd
+++ b/v3_17_0/CDT-request-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-requestPrimitive-v3_17_0.xsd b/v3_17_0/CDT-requestPrimitive-v3_17_0.xsd
index 02c172bc26fd8640df33c1155f7d689171d33b14..c9731b74d8840691a5123dd939c18e942234a988 100644
--- a/v3_17_0/CDT-requestPrimitive-v3_17_0.xsd
+++ b/v3_17_0/CDT-requestPrimitive-v3_17_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_17_0/CDT-responsePrimitive-v3_17_0.xsd b/v3_17_0/CDT-responsePrimitive-v3_17_0.xsd
index 01d82c16642ec85dd993652099dad0dcec026111..7f632f14ad8527ee5325a05a269ed6116f1839b6 100644
--- a/v3_17_0/CDT-responsePrimitive-v3_17_0.xsd
+++ b/v3_17_0/CDT-responsePrimitive-v3_17_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_16_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_16_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_17_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_17_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_17_0/CDT-role-v3_17_0.xsd b/v3_17_0/CDT-role-v3_17_0.xsd
index af39b970ec6fa67d5d6a03d559deaddf6e08cd5c..05542802c9cbfaebc90cf10fde0908da3913fcf5 100644
--- a/v3_17_0/CDT-role-v3_17_0.xsd
+++ b/v3_17_0/CDT-role-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-schedule-v3_17_0.xsd b/v3_17_0/CDT-schedule-v3_17_0.xsd
index 7de259979ca45a8ffa1a303d9c8be94a07b7854a..81e16f0d1ec890f50e91122780717443bc04b490 100644
--- a/v3_17_0/CDT-schedule-v3_17_0.xsd
+++ b/v3_17_0/CDT-schedule-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-semanticDescriptor-v3_17_0.xsd b/v3_17_0/CDT-semanticDescriptor-v3_17_0.xsd
index d7488ab3784609a9fcc715fb6d880015cfc47042..fcf48ef9ed8f06693a0136675769500d6de980cb 100644
--- a/v3_17_0/CDT-semanticDescriptor-v3_17_0.xsd
+++ b/v3_17_0/CDT-semanticDescriptor-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-semanticMashupInstance-v3_17_0.xsd b/v3_17_0/CDT-semanticMashupInstance-v3_17_0.xsd
index c31b6cb9a8f6ef62c1b8e9194c027656e504491d..e8ccf2ecf52628036e6db07f785cb480087ea084 100644
--- a/v3_17_0/CDT-semanticMashupInstance-v3_17_0.xsd
+++ b/v3_17_0/CDT-semanticMashupInstance-v3_17_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-semanticMashupJobProfile-v3_17_0.xsd b/v3_17_0/CDT-semanticMashupJobProfile-v3_17_0.xsd
index ea6fca81fe6f80d825bb37a66254ba1991396d16..c8585272294626351a57cbe6d44a5c9dbde33f4a 100644
--- a/v3_17_0/CDT-semanticMashupJobProfile-v3_17_0.xsd
+++ b/v3_17_0/CDT-semanticMashupJobProfile-v3_17_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-semanticMashupResult-v3_17_0.xsd b/v3_17_0/CDT-semanticMashupResult-v3_17_0.xsd
index ea853704349b5605eed88cac927127b962a8f534..3c4964e063512df95d3961d454777438e0d7d294 100644
--- a/v3_17_0/CDT-semanticMashupResult-v3_17_0.xsd
+++ b/v3_17_0/CDT-semanticMashupResult-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-serviceSubscribedAppRule-v3_17_0.xsd b/v3_17_0/CDT-serviceSubscribedAppRule-v3_17_0.xsd
index 02e4f56379d47385e3640f935498d31d47cec678..ff0b913c69846beebbde3615a87a855f36e31f03 100644
--- a/v3_17_0/CDT-serviceSubscribedAppRule-v3_17_0.xsd
+++ b/v3_17_0/CDT-serviceSubscribedAppRule-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-serviceSubscribedNode-v3_17_0.xsd b/v3_17_0/CDT-serviceSubscribedNode-v3_17_0.xsd
index 90aa4910604167da7008f0cf6b273aa86bb3a7f3..a5ca55b87474221dea8b5edc34c09ac8f4222cb6 100644
--- a/v3_17_0/CDT-serviceSubscribedNode-v3_17_0.xsd
+++ b/v3_17_0/CDT-serviceSubscribedNode-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-software-v3_17_0.xsd b/v3_17_0/CDT-software-v3_17_0.xsd
index b5732e8f75aa7e9c44792e7b920be34af8c1a99b..ab500e3236fd468f9462f28776334937483f20a2 100644
--- a/v3_17_0/CDT-software-v3_17_0.xsd
+++ b/v3_17_0/CDT-software-v3_17_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-statsCollect-v3_17_0.xsd b/v3_17_0/CDT-statsCollect-v3_17_0.xsd
index 965b8705e79a088ba620cd917aefc0d1e255c7ee..cfbf0e61cb0ff144461457f08eab0d015fcda867 100644
--- a/v3_17_0/CDT-statsCollect-v3_17_0.xsd
+++ b/v3_17_0/CDT-statsCollect-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-statsConfig-v3_17_0.xsd b/v3_17_0/CDT-statsConfig-v3_17_0.xsd
index 34026e179c2ef82dc7e949f41c23b4b227914051..0f05022b317ea281e10ac13ad892e80fd6d6fe01 100644
--- a/v3_17_0/CDT-statsConfig-v3_17_0.xsd
+++ b/v3_17_0/CDT-statsConfig-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-subscription-v3_17_0.xsd b/v3_17_0/CDT-subscription-v3_17_0.xsd
index 5326ad23b5109ffc74165bd187ea58259212ad19..ef256223506c1b6f95138e470fbb71f38b049dd8 100644
--- a/v3_17_0/CDT-subscription-v3_17_0.xsd
+++ b/v3_17_0/CDT-subscription-v3_17_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-svcFwWrapper-v3_17_0.xsd b/v3_17_0/CDT-svcFwWrapper-v3_17_0.xsd
index 3de96f11478976feb2495c1470d2b6641e39af49..b439dc453a36fc7cd88b7d4e3819253cf665788e 100644
--- a/v3_17_0/CDT-svcFwWrapper-v3_17_0.xsd
+++ b/v3_17_0/CDT-svcFwWrapper-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-svcObjWrapper-v3_17_0.xsd b/v3_17_0/CDT-svcObjWrapper-v3_17_0.xsd
index 98d1f09fc0ac33489f7f32c6f43768b7478a7d09..8717576f0b28e59fcb1a30c5bb2889742b325af4 100644
--- a/v3_17_0/CDT-svcObjWrapper-v3_17_0.xsd
+++ b/v3_17_0/CDT-svcObjWrapper-v3_17_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_17_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-timeSeries-v3_17_0.xsd b/v3_17_0/CDT-timeSeries-v3_17_0.xsd
index ed0834342600b33d3c002e7b6873c5ab836c8c62..40593c27e9463663091a7e995874ba36e8a8fff2 100644
--- a/v3_17_0/CDT-timeSeries-v3_17_0.xsd
+++ b/v3_17_0/CDT-timeSeries-v3_17_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_17_0/CDT-timeSeriesInstance-v3_17_0.xsd b/v3_17_0/CDT-timeSeriesInstance-v3_17_0.xsd
index 082b9dc42fff778f3f407d2f1db8bfd3cdc2ac0e..2c9a26d4ae390030170395d20f27448b744611d1 100644
--- a/v3_17_0/CDT-timeSeriesInstance-v3_17_0.xsd
+++ b/v3_17_0/CDT-timeSeriesInstance-v3_17_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_17_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-token-v3_17_0.xsd b/v3_17_0/CDT-token-v3_17_0.xsd
index 76f92002d234021219e5e9c48e7f84beebb595a0..59e9c31778523d3d11839b08b6cecde12d9fc010 100644
--- a/v3_17_0/CDT-token-v3_17_0.xsd
+++ b/v3_17_0/CDT-token-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_17_0/CDT-transaction-v3_17_0.xsd b/v3_17_0/CDT-transaction-v3_17_0.xsd
index b6ae39ab521274c7964c25da515bd4f9f539813b..a69fde045dbf97af00d0d057328560541644fb1f 100644
--- a/v3_17_0/CDT-transaction-v3_17_0.xsd
+++ b/v3_17_0/CDT-transaction-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-transactionMgmt-v3_17_0.xsd b/v3_17_0/CDT-transactionMgmt-v3_17_0.xsd
index 20c433b2960bf47d39c26eba8edd3c48b46409a4..8e43c482f59981c0e00817c8d8a0ea519511e93b 100644
--- a/v3_17_0/CDT-transactionMgmt-v3_17_0.xsd
+++ b/v3_17_0/CDT-transactionMgmt-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_17_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-triggerPayload-v3_17_0.xsd b/v3_17_0/CDT-triggerPayload-v3_17_0.xsd
index 35b49b4f3b7f873b45ecf20155277fb4bbd40b40..e02b9d50f54713840571425fe2c960118622916e 100644
--- a/v3_17_0/CDT-triggerPayload-v3_17_0.xsd
+++ b/v3_17_0/CDT-triggerPayload-v3_17_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_17_0/CDT-triggerRequest-v3_17_0.xsd b/v3_17_0/CDT-triggerRequest-v3_17_0.xsd
index a76ec97e3f024eef043d730fe8e7452c4cac1f3d..08314372a6f665c654d127b777ea6e76516e05ef 100644
--- a/v3_17_0/CDT-triggerRequest-v3_17_0.xsd
+++ b/v3_17_0/CDT-triggerRequest-v3_17_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_16_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_16_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_17_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_17_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>