diff --git a/v3_9_0/CDT-AE-v3_9_0.xsd b/v3_9_0/CDT-AE-v3_9_0.xsd
index dc6e9edf282f8df775077c43b8d0965b4195bd30..db2a4ca37523669b7f769289de4fe6602e6072a6 100644
--- a/v3_9_0/CDT-AE-v3_9_0.xsd
+++ b/v3_9_0/CDT-AE-v3_9_0.xsd
@@ -26,21 +26,21 @@ 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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-AEContactList-v3_9_0.xsd b/v3_9_0/CDT-AEContactList-v3_9_0.xsd
index d57eba00acf8e44dbb1a4aade47619bcdb334e5b..4409640d071e826f6086119d21286b11b175f95a 100644
--- a/v3_9_0/CDT-AEContactList-v3_9_0.xsd
+++ b/v3_9_0/CDT-AEContactList-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-AEContactListPerCSE-v3_9_0.xsd b/v3_9_0/CDT-AEContactListPerCSE-v3_9_0.xsd
index 026dc1dc7fc1135d820b16d3823130ccfcff774b..10387b2aed63ca9349feccba79e8901dbc87aebc 100644
--- a/v3_9_0/CDT-AEContactListPerCSE-v3_9_0.xsd
+++ b/v3_9_0/CDT-AEContactListPerCSE-v3_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-CSEBase-v3_9_0.xsd b/v3_9_0/CDT-CSEBase-v3_9_0.xsd
index 579e9971e0a478ef28b46d2490953ad99bbddb19..1cce53369e2984afeab58cc22dab7618d1b9bed7 100644
--- a/v3_9_0/CDT-CSEBase-v3_9_0.xsd
+++ b/v3_9_0/CDT-CSEBase-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_8_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_8_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_9_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_9_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_9_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_9_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-accessControlPolicy-v3_9_0.xsd b/v3_9_0/CDT-accessControlPolicy-v3_9_0.xsd
index c474b055d855a31c4495dd0131d462e229262184..66225d701b4f7db03612aee42ed74fa13a860291 100644
--- a/v3_9_0/CDT-accessControlPolicy-v3_9_0.xsd
+++ b/v3_9_0/CDT-accessControlPolicy-v3_9_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_8_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-activeCmdhPolicy-v3_9_0.xsd b/v3_9_0/CDT-activeCmdhPolicy-v3_9_0.xsd
index 0b53230461fc1198c600b82d1cfd4f654b47bbbf..416c49c35f2ed6d24226db6bfcd4d5179cb0582f 100644
--- a/v3_9_0/CDT-activeCmdhPolicy-v3_9_0.xsd
+++ b/v3_9_0/CDT-activeCmdhPolicy-v3_9_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_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_9_0/CDT-allJoynApp-v3_9_0.xsd b/v3_9_0/CDT-allJoynApp-v3_9_0.xsd
index fe21efe81472ccabd8f217eb3a690d12a21cf70d..9c95c31753218a469f921c61e47db9d7678b0059 100644
--- a/v3_9_0/CDT-allJoynApp-v3_9_0.xsd
+++ b/v3_9_0/CDT-allJoynApp-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_9_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-allJoynInterface-v3_9_0.xsd b/v3_9_0/CDT-allJoynInterface-v3_9_0.xsd
index 5c1cac46afbf6ae009937aceb1318d7d47598506..02508ce76efdeaec0122e785a4394dfc59c59205 100644
--- a/v3_9_0/CDT-allJoynInterface-v3_9_0.xsd
+++ b/v3_9_0/CDT-allJoynInterface-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_9_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_9_0/CDT-allJoynMethod-v3_9_0.xsd b/v3_9_0/CDT-allJoynMethod-v3_9_0.xsd
index dde96d77bdbb277a17c81b30f5b5e9f019094833..8efb57ec13efe2d799bbf73fd3461bb3cc09baad 100644
--- a/v3_9_0/CDT-allJoynMethod-v3_9_0.xsd
+++ b/v3_9_0/CDT-allJoynMethod-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_9_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_9_0/CDT-allJoynMethodCall-v3_9_0.xsd b/v3_9_0/CDT-allJoynMethodCall-v3_9_0.xsd
index 0a783edb37de89910d3b1809fbd2a4db265b33ba..93b6e730ab2d7eb039bdb88a5b7a7be6b6252251 100644
--- a/v3_9_0/CDT-allJoynMethodCall-v3_9_0.xsd
+++ b/v3_9_0/CDT-allJoynMethodCall-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-allJoynProperty-v3_9_0.xsd b/v3_9_0/CDT-allJoynProperty-v3_9_0.xsd
index f70100b7b8e2c3ab7677fbbf95e822c23ee1573e..fb300bcf0be76310924aac8f8cf5c8aa77850d05 100644
--- a/v3_9_0/CDT-allJoynProperty-v3_9_0.xsd
+++ b/v3_9_0/CDT-allJoynProperty-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-allJoynSvcObject-v3_9_0.xsd b/v3_9_0/CDT-allJoynSvcObject-v3_9_0.xsd
index 49bbdc8b95857a047e2f1d390d0032228ddd7820..677f36518a1a4284b989ec8baa24d0af2cbc10b2 100644
--- a/v3_9_0/CDT-allJoynSvcObject-v3_9_0.xsd
+++ b/v3_9_0/CDT-allJoynSvcObject-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_9_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-areaNwkDeviceInfo-v3_9_0.xsd b/v3_9_0/CDT-areaNwkDeviceInfo-v3_9_0.xsd
index 60c8bca3a6b0f478cbbdba8a142bb09f4ee784d6..b01bdc18679ff68ebbe5b90d02e50255d7d00f63 100644
--- a/v3_9_0/CDT-areaNwkDeviceInfo-v3_9_0.xsd
+++ b/v3_9_0/CDT-areaNwkDeviceInfo-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-areaNwkInfo-v3_9_0.xsd b/v3_9_0/CDT-areaNwkInfo-v3_9_0.xsd
index 1475cace6fe644fbc3d6b3c73674bbbc8118a1aa..75550747a7bec8b264ec8a33c48ff463ca1b1aeb 100644
--- a/v3_9_0/CDT-areaNwkInfo-v3_9_0.xsd
+++ b/v3_9_0/CDT-areaNwkInfo-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-authorizationDecision-v3_9_0.xsd b/v3_9_0/CDT-authorizationDecision-v3_9_0.xsd
index 0c44f8a935575b2b89c2c082a8dcdb9de0c9e8e6..10234e16531b475e65de7f4473551c3a8181246c 100644
--- a/v3_9_0/CDT-authorizationDecision-v3_9_0.xsd
+++ b/v3_9_0/CDT-authorizationDecision-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-authorizationInformation-v3_9_0.xsd b/v3_9_0/CDT-authorizationInformation-v3_9_0.xsd
index 4e075e52c20e030017b5cc00c41abe27c57927cd..1d2ae449e87fe1f64697551a39ee4fe340fdf4c9 100644
--- a/v3_9_0/CDT-authorizationInformation-v3_9_0.xsd
+++ b/v3_9_0/CDT-authorizationInformation-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-authorizationPolicy-v3_9_0.xsd b/v3_9_0/CDT-authorizationPolicy-v3_9_0.xsd
index 2c386a0f1343b0ee3035aba309cd265b4d367a55..109e48683d57ab745b5e7308464bcedc26763e98 100644
--- a/v3_9_0/CDT-authorizationPolicy-v3_9_0.xsd
+++ b/v3_9_0/CDT-authorizationPolicy-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-backgroundDataTransfer-v3_9_0.xsd b/v3_9_0/CDT-backgroundDataTransfer-v3_9_0.xsd
index 22d5d4c40c9cc5be0c6d5486d44f4f2bdf956de8..6ea50225ee1b4064a9b88c4bd47dbc21c36150c8 100644
--- a/v3_9_0/CDT-backgroundDataTransfer-v3_9_0.xsd
+++ b/v3_9_0/CDT-backgroundDataTransfer-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-battery-v3_9_0.xsd b/v3_9_0/CDT-battery-v3_9_0.xsd
index 56f5304b90d2a344cf9c1711e47c0568af64d4d5..5201a531a4da38d6d068611ec521c7b534b0e99d 100644
--- a/v3_9_0/CDT-battery-v3_9_0.xsd
+++ b/v3_9_0/CDT-battery-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-cmdhBuffer-v3_9_0.xsd b/v3_9_0/CDT-cmdhBuffer-v3_9_0.xsd
index ca3a29c0c7e44073d4fcecc8940f3096b9e97408..e47a5f258719f003298dfd1e722a09f46b7cd8ce 100644
--- a/v3_9_0/CDT-cmdhBuffer-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhBuffer-v3_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_9_0/CDT-cmdhDefEcValue-v3_9_0.xsd b/v3_9_0/CDT-cmdhDefEcValue-v3_9_0.xsd
index 83d40d466c624699de6cf3e2db143972a01b5d58..1467753fdd3b275e093e03b317c081083f7d3c2b 100644
--- a/v3_9_0/CDT-cmdhDefEcValue-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhDefEcValue-v3_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_9_0/CDT-cmdhDefaults-v3_9_0.xsd b/v3_9_0/CDT-cmdhDefaults-v3_9_0.xsd
index 3e788d21896d24eef51e7d42f5c90b98aae323de..411ab3247c486888133eb8420ed6fcb5f79bb35f 100644
--- a/v3_9_0/CDT-cmdhDefaults-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhDefaults-v3_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_9_0/CDT-cmdhEcDefParamValues-v3_9_0.xsd b/v3_9_0/CDT-cmdhEcDefParamValues-v3_9_0.xsd
index bcdaf2dbbd4c1e3e10a30052c1564ebdfac56998..95bc3f84adb8e9715d3521acf14d700c3cf19cf7 100644
--- a/v3_9_0/CDT-cmdhEcDefParamValues-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhEcDefParamValues-v3_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_9_0/CDT-cmdhLimits-v3_9_0.xsd b/v3_9_0/CDT-cmdhLimits-v3_9_0.xsd
index f5d72b5baf623a64b93c62df21c13fb1a88f10b9..1eb0fb6c78e7b7f02cc8218b4f70a68d156dd9c7 100644
--- a/v3_9_0/CDT-cmdhLimits-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhLimits-v3_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_9_0/CDT-cmdhNetworkAccessRules-v3_9_0.xsd b/v3_9_0/CDT-cmdhNetworkAccessRules-v3_9_0.xsd
index 9960563a6b1d0d02dbf69fc29dd0da746f273fbe..834561c8bed08b9416ce1f363fb3b6e2214fba52 100644
--- a/v3_9_0/CDT-cmdhNetworkAccessRules-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhNetworkAccessRules-v3_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_9_0/CDT-cmdhNwAccessRule-v3_9_0.xsd b/v3_9_0/CDT-cmdhNwAccessRule-v3_9_0.xsd
index 3bcb3c72f7886f7bda6a7d79b702d742a69df998..0b05a57049e44de7a7a7dc27f4412eb781650119 100644
--- a/v3_9_0/CDT-cmdhNwAccessRule-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhNwAccessRule-v3_9_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_8_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_9_0/CDT-cmdhPolicy-v3_9_0.xsd b/v3_9_0/CDT-cmdhPolicy-v3_9_0.xsd
index b4a26abe9287c4978cd9cabf5665bf122f7d8dcc..45b513eae0cec85e3f77e0f7b4c759d93a4be3f1 100644
--- a/v3_9_0/CDT-cmdhPolicy-v3_9_0.xsd
+++ b/v3_9_0/CDT-cmdhPolicy-v3_9_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_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_9_0/CDT-commonTypes-v3_9_0.xsd b/v3_9_0/CDT-commonTypes-v3_9_0.xsd
index fb62aed0f3cb325262da8a78111634a48297b2d8..d34972f308868ca40842501149b5b9d762f7a985 100644
--- a/v3_9_0/CDT-commonTypes-v3_9_0.xsd
+++ b/v3_9_0/CDT-commonTypes-v3_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_9_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_9_0/CDT-container-v3_9_0.xsd b/v3_9_0/CDT-container-v3_9_0.xsd
index c51b7d2a0d2e719b4b6c843a873e4dd56bf383ae..36bd472397ec2b061fb4854e23a4220e0fe53043 100644
--- a/v3_9_0/CDT-container-v3_9_0.xsd
+++ b/v3_9_0/CDT-container-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_9_0/CDT-contentInstance-v3_9_0.xsd b/v3_9_0/CDT-contentInstance-v3_9_0.xsd
index b08911dbf430a57d8e8cf682150b809a6ac93647..3df7661a61e3d5a1a92e747dae3d8acdb49dce99 100644
--- a/v3_9_0/CDT-contentInstance-v3_9_0.xsd
+++ b/v3_9_0/CDT-contentInstance-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-crossResourceSubscription-v3_9_0.xsd b/v3_9_0/CDT-crossResourceSubscription-v3_9_0.xsd
index e7c6f140fee96e63ba96306ebb43de1d0424b683..963d5d8d0e1e1b8c3a30d11d17f5fae819fba99d 100644
--- a/v3_9_0/CDT-crossResourceSubscription-v3_9_0.xsd
+++ b/v3_9_0/CDT-crossResourceSubscription-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-delivery-v3_9_0.xsd b/v3_9_0/CDT-delivery-v3_9_0.xsd
index 588989dcc400ff9b5b6e1a6f5667ee9ad368e83b..0341af835c0bd8b0dc04b16e9644513dcbfed4bc 100644
--- a/v3_9_0/CDT-delivery-v3_9_0.xsd
+++ b/v3_9_0/CDT-delivery-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_9_0/CDT-deviceCapability-v3_9_0.xsd b/v3_9_0/CDT-deviceCapability-v3_9_0.xsd
index 9b3b64447081e9dad6af119f1e8ab9d09d675f4c..28e79e18fc4e23b65ec8ce86315bf18317c1cd10 100644
--- a/v3_9_0/CDT-deviceCapability-v3_9_0.xsd
+++ b/v3_9_0/CDT-deviceCapability-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-deviceInfo-v3_9_0.xsd b/v3_9_0/CDT-deviceInfo-v3_9_0.xsd
index f8a7e6cc00b30b5da94ba5ddaf500d2847923569..50ca3a3477b624829cbd92c58c1d358bb19b4bbe 100644
--- a/v3_9_0/CDT-deviceInfo-v3_9_0.xsd
+++ b/v3_9_0/CDT-deviceInfo-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-dynamicAuthorizationConsultation-v3_9_0.xsd b/v3_9_0/CDT-dynamicAuthorizationConsultation-v3_9_0.xsd
index 48d86993abe9d168b861ef9a794f9b8cec0db12c..7bb4fd0f29181e100ce4cf8bb58442f78320b7ba 100644
--- a/v3_9_0/CDT-dynamicAuthorizationConsultation-v3_9_0.xsd
+++ b/v3_9_0/CDT-dynamicAuthorizationConsultation-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-eventConfig-v3_9_0.xsd b/v3_9_0/CDT-eventConfig-v3_9_0.xsd
index 1ef2592cd0a74f4bdfa97dfb627c82f75f9a02e1..0a0dd2fd436ca88b89f3e741cc4305dce09cc7ef 100644
--- a/v3_9_0/CDT-eventConfig-v3_9_0.xsd
+++ b/v3_9_0/CDT-eventConfig-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-eventLog-v3_9_0.xsd b/v3_9_0/CDT-eventLog-v3_9_0.xsd
index f717659f8af57c128993286f691a7606f582069d..13fe7f7810d68208fabd59fed761d55406fef868 100644
--- a/v3_9_0/CDT-eventLog-v3_9_0.xsd
+++ b/v3_9_0/CDT-eventLog-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-execInstance-v3_9_0.xsd b/v3_9_0/CDT-execInstance-v3_9_0.xsd
index 963f97fc08c8ce876d8fd9fbc62c9d6e7686c1ba..59e9f6b42c4280637733610dc0e54f650e25ae12 100644
--- a/v3_9_0/CDT-execInstance-v3_9_0.xsd
+++ b/v3_9_0/CDT-execInstance-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-firmware-v3_9_0.xsd b/v3_9_0/CDT-firmware-v3_9_0.xsd
index 6ea71a6e5ba4a44c1fc3047307266bae6a28c143..5f959ce69876ad96e2960a9dc8b0d09ea1aa736e 100644
--- a/v3_9_0/CDT-firmware-v3_9_0.xsd
+++ b/v3_9_0/CDT-firmware-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-genericInterworkingOperationInstance-v3_9_0.xsd b/v3_9_0/CDT-genericInterworkingOperationInstance-v3_9_0.xsd
index ac9b2318f37d6cfaff96f374e0af0a103abbc8a5..a7672311bbd7dd80e828770d5ce7645a2fbb3e1e 100644
--- a/v3_9_0/CDT-genericInterworkingOperationInstance-v3_9_0.xsd
+++ b/v3_9_0/CDT-genericInterworkingOperationInstance-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-genericInterworkingService-v3_9_0.xsd b/v3_9_0/CDT-genericInterworkingService-v3_9_0.xsd
index 5a12b2426de3f4b4407d02e626e05504b867d8a0..a13b506f116e17b7c3351e09a04ce846aa07d716 100644
--- a/v3_9_0/CDT-genericInterworkingService-v3_9_0.xsd
+++ b/v3_9_0/CDT-genericInterworkingService-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_9_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-group-v3_9_0.xsd b/v3_9_0/CDT-group-v3_9_0.xsd
index 54d38e7625a56e1971951bedd058c9b0cb6c52f6..f124fe69243c007786d9789c35e5ceecde911d36 100644
--- a/v3_9_0/CDT-group-v3_9_0.xsd
+++ b/v3_9_0/CDT-group-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_9_0/CDT-localMulticastGroup-v3_9_0.xsd b/v3_9_0/CDT-localMulticastGroup-v3_9_0.xsd
index 98dd2b6daab59bac835af719ecf0379049ba6f42..428b6f99bbd3e3b9cb8c1978d32d89869a7475ec 100644
--- a/v3_9_0/CDT-localMulticastGroup-v3_9_0.xsd
+++ b/v3_9_0/CDT-localMulticastGroup-v3_9_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_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_9_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_9_0/CDT-locationPolicy-v3_9_0.xsd b/v3_9_0/CDT-locationPolicy-v3_9_0.xsd
index 1f884051ac35374489a6f34d2103266a72558d59..b2cc2586c885a01510c8098fb70ad176ac4c058c 100644
--- a/v3_9_0/CDT-locationPolicy-v3_9_0.xsd
+++ b/v3_9_0/CDT-locationPolicy-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-m2mServiceSubscriptionProfile-v3_9_0.xsd b/v3_9_0/CDT-m2mServiceSubscriptionProfile-v3_9_0.xsd
index e07689c9e217e82736489523b5e6d616a66aef07..3fbcbbea8d0d2a9834692493a95be513b394a3fb 100644
--- a/v3_9_0/CDT-m2mServiceSubscriptionProfile-v3_9_0.xsd
+++ b/v3_9_0/CDT-m2mServiceSubscriptionProfile-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-memory-v3_9_0.xsd b/v3_9_0/CDT-memory-v3_9_0.xsd
index 7167f41943519e830496608c8c7060a543b3f55f..109c70d47370f501e54a1e04136d5e6c04170926 100644
--- a/v3_9_0/CDT-memory-v3_9_0.xsd
+++ b/v3_9_0/CDT-memory-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-mgmtCmd-v3_9_0.xsd b/v3_9_0/CDT-mgmtCmd-v3_9_0.xsd
index beecdb76f50881b09e134d317afaccf996fa5e2b..7d37209ff45943ffed6126445846339e02357a04 100644
--- a/v3_9_0/CDT-mgmtCmd-v3_9_0.xsd
+++ b/v3_9_0/CDT-mgmtCmd-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-multimediaSession-v3_9_0.xsd b/v3_9_0/CDT-multimediaSession-v3_9_0.xsd
index ca5a1d57e74cd7722173b8bc294aa4501a2046c1..b764a7bf2257664ef44815cb2267033c1ceb9abf 100644
--- a/v3_9_0/CDT-multimediaSession-v3_9_0.xsd
+++ b/v3_9_0/CDT-multimediaSession-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-node-v3_9_0.xsd b/v3_9_0/CDT-node-v3_9_0.xsd
index eb9e7c62063262c4e4866832d18d883784a1acd1..3fe1859e74c245ccc83bf6a274c71c3bdcc62431 100644
--- a/v3_9_0/CDT-node-v3_9_0.xsd
+++ b/v3_9_0/CDT-node-v3_9_0.xsd
@@ -27,22 +27,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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-notification-v3_9_0.xsd b/v3_9_0/CDT-notification-v3_9_0.xsd
index 85c0799c2e286787d82195caef963db9f6368586..68f6656efb205f7b7d49052a307c4988aacc86af 100644
--- a/v3_9_0/CDT-notification-v3_9_0.xsd
+++ b/v3_9_0/CDT-notification-v3_9_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_8_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_9_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_9_0/CDT-notificationTargetMgmtPolicyRef-v3_9_0.xsd b/v3_9_0/CDT-notificationTargetMgmtPolicyRef-v3_9_0.xsd
index 59cbc9458a57e437275043e0b36407c9019df430..48f85cff5848d3cc72b8a94f73ab5431575d14af 100644
--- a/v3_9_0/CDT-notificationTargetMgmtPolicyRef-v3_9_0.xsd
+++ b/v3_9_0/CDT-notificationTargetMgmtPolicyRef-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-notificationTargetPolicy-v3_9_0.xsd b/v3_9_0/CDT-notificationTargetPolicy-v3_9_0.xsd
index a62f9335932eccb590f384dcc54a41d1f183e1fc..d362a6f747410348115d79ae1ffa273a5151dc1f 100644
--- a/v3_9_0/CDT-notificationTargetPolicy-v3_9_0.xsd
+++ b/v3_9_0/CDT-notificationTargetPolicy-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-ontology-v3_9_0.xsd b/v3_9_0/CDT-ontology-v3_9_0.xsd
index c4bd44819ca0f3f59ac8ec2dfc4bdbce89a2023e..81bfdbd7784b61de37c41da34f70ac852bb8daf5 100644
--- a/v3_9_0/CDT-ontology-v3_9_0.xsd
+++ b/v3_9_0/CDT-ontology-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_9_0/CDT-ontologyRepository-v3_9_0.xsd b/v3_9_0/CDT-ontologyRepository-v3_9_0.xsd
index fc08b45307b468d538e0dc45d58ca0f83b5e59de..7a3ae54eaa8203995316302ca8bd50c534e1c3aa 100644
--- a/v3_9_0/CDT-ontologyRepository-v3_9_0.xsd
+++ b/v3_9_0/CDT-ontologyRepository-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_9_0/CDT-policyDeletionRules-v3_9_0.xsd b/v3_9_0/CDT-policyDeletionRules-v3_9_0.xsd
index 5a949435cafeabdbf40e51536783791a466657b6..b98f1efcb71cef642d401ac56ecef711827ca5a2 100644
--- a/v3_9_0/CDT-policyDeletionRules-v3_9_0.xsd
+++ b/v3_9_0/CDT-policyDeletionRules-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-pollingChannel-v3_9_0.xsd b/v3_9_0/CDT-pollingChannel-v3_9_0.xsd
index f13823e3e0836c76ef62dc9cfe03110e28a1f34f..b18f3703d8f9c5a3b3b262dd6f1474dcb78cd827 100644
--- a/v3_9_0/CDT-pollingChannel-v3_9_0.xsd
+++ b/v3_9_0/CDT-pollingChannel-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-reboot-v3_9_0.xsd b/v3_9_0/CDT-reboot-v3_9_0.xsd
index 1a78ec7f9e59c89cae5fe81f819f992a05daeb6d..d1fe6bf1de1d3b585c6beda44d324438c6866a0c 100644
--- a/v3_9_0/CDT-reboot-v3_9_0.xsd
+++ b/v3_9_0/CDT-reboot-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-remoteCSE-v3_9_0.xsd b/v3_9_0/CDT-remoteCSE-v3_9_0.xsd
index 66f4cfccb538b5768fa46449ba69fe016832d15a..d79392fbcedacd00b8b085bbcfa8168612d5e69e 100644
--- a/v3_9_0/CDT-remoteCSE-v3_9_0.xsd
+++ b/v3_9_0/CDT-remoteCSE-v3_9_0.xsd
@@ -26,23 +26,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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-request-v3_9_0.xsd b/v3_9_0/CDT-request-v3_9_0.xsd
index 9c0f3935bbdf061635eb2c5a9627e0bb38cce403..2620831690f93d7e1d257cd2be8e3293bf321aec 100644
--- a/v3_9_0/CDT-request-v3_9_0.xsd
+++ b/v3_9_0/CDT-request-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-requestPrimitive-v3_9_0.xsd b/v3_9_0/CDT-requestPrimitive-v3_9_0.xsd
index dc60acc2da18c8b20c8b7dd3c140443b97b0d194..daceb8b1a394e8a7761ae9a0436f82cca76800fd 100644
--- a/v3_9_0/CDT-requestPrimitive-v3_9_0.xsd
+++ b/v3_9_0/CDT-requestPrimitive-v3_9_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_8_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_9_0/CDT-responsePrimitive-v3_9_0.xsd b/v3_9_0/CDT-responsePrimitive-v3_9_0.xsd
index 4b3607298edcb2e0fd3bd4d238faab7b7ad904c1..9d0fb382e0d18afe455065288f23e73cb0d30be9 100644
--- a/v3_9_0/CDT-responsePrimitive-v3_9_0.xsd
+++ b/v3_9_0/CDT-responsePrimitive-v3_9_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_8_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_9_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_9_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_9_0/CDT-role-v3_9_0.xsd b/v3_9_0/CDT-role-v3_9_0.xsd
index 290c99e9a69998a8eb685a9940bb50a1d4e4ebbb..66225e0d6ccb7a6bf1cf1feb24bec2867d9be559 100644
--- a/v3_9_0/CDT-role-v3_9_0.xsd
+++ b/v3_9_0/CDT-role-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-schedule-v3_9_0.xsd b/v3_9_0/CDT-schedule-v3_9_0.xsd
index be888bb7282276681368fe4a166423a6723bad05..039e2e6654f671becdc3d363d50f147ac2dcd241 100644
--- a/v3_9_0/CDT-schedule-v3_9_0.xsd
+++ b/v3_9_0/CDT-schedule-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-semanticDescriptor-v3_9_0.xsd b/v3_9_0/CDT-semanticDescriptor-v3_9_0.xsd
index 112e576f00e8ea98e06cb30d81e79ae4d0742da6..817a002d4d644dfe1fab54ccf20ff67b073f7035 100644
--- a/v3_9_0/CDT-semanticDescriptor-v3_9_0.xsd
+++ b/v3_9_0/CDT-semanticDescriptor-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-semanticMashupInstance-v3_9_0.xsd b/v3_9_0/CDT-semanticMashupInstance-v3_9_0.xsd
index 6991e92bb7584da47aceb115990a508595a4699a..af1ecf9d6362fd7d8ad428279ccfcec4a2655601 100644
--- a/v3_9_0/CDT-semanticMashupInstance-v3_9_0.xsd
+++ b/v3_9_0/CDT-semanticMashupInstance-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-semanticMashupJobProfile-v3_9_0.xsd b/v3_9_0/CDT-semanticMashupJobProfile-v3_9_0.xsd
index dee50848f8598c70c0654b3055a082f117ce557f..0671ee79ab85a64108796a54073d877e7617727e 100644
--- a/v3_9_0/CDT-semanticMashupJobProfile-v3_9_0.xsd
+++ b/v3_9_0/CDT-semanticMashupJobProfile-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-semanticMashupResult-v3_9_0.xsd b/v3_9_0/CDT-semanticMashupResult-v3_9_0.xsd
index 8743f9aaaf8cfcbd04d3a365448adef631a1c11a..185ff15bad97522f8da50db0ef7d280cf930c448 100644
--- a/v3_9_0/CDT-semanticMashupResult-v3_9_0.xsd
+++ b/v3_9_0/CDT-semanticMashupResult-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-serviceSubscribedAppRule-v3_9_0.xsd b/v3_9_0/CDT-serviceSubscribedAppRule-v3_9_0.xsd
index df0b3338013aff4ae33484ba717b88a101228f9d..339849cbb145cc76b6f632740802654b6e190188 100644
--- a/v3_9_0/CDT-serviceSubscribedAppRule-v3_9_0.xsd
+++ b/v3_9_0/CDT-serviceSubscribedAppRule-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-serviceSubscribedNode-v3_9_0.xsd b/v3_9_0/CDT-serviceSubscribedNode-v3_9_0.xsd
index dfe829622624a87588b60039e28b8da1262fdd90..dacfa3c279621679dc201072283172302cd3c4cb 100644
--- a/v3_9_0/CDT-serviceSubscribedNode-v3_9_0.xsd
+++ b/v3_9_0/CDT-serviceSubscribedNode-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-software-v3_9_0.xsd b/v3_9_0/CDT-software-v3_9_0.xsd
index 2c705616efb094fd6b99d39e8679c664c01899f0..b34809bf3d9be37d10c06b2c0a78f6f6a87ed321 100644
--- a/v3_9_0/CDT-software-v3_9_0.xsd
+++ b/v3_9_0/CDT-software-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-statsCollect-v3_9_0.xsd b/v3_9_0/CDT-statsCollect-v3_9_0.xsd
index 2bcd9d77f4cf9bcfd3938a8741d8d19ec99d6155..a0f5905b3227b178918f973a5bd01fa3b4a9baaf 100644
--- a/v3_9_0/CDT-statsCollect-v3_9_0.xsd
+++ b/v3_9_0/CDT-statsCollect-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-statsConfig-v3_9_0.xsd b/v3_9_0/CDT-statsConfig-v3_9_0.xsd
index 7432f11115e0c2da58ba38a315caa643d1490192..2b391f23be50186522b33e1fff3396db04ad024e 100644
--- a/v3_9_0/CDT-statsConfig-v3_9_0.xsd
+++ b/v3_9_0/CDT-statsConfig-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-subscription-v3_9_0.xsd b/v3_9_0/CDT-subscription-v3_9_0.xsd
index f743ea1ed25f0a0332024f202cf96effdabaad4c..300a155b3a9f93829a7ba250cbcd644b3ac1ab93 100644
--- a/v3_9_0/CDT-subscription-v3_9_0.xsd
+++ b/v3_9_0/CDT-subscription-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-svcFwWrapper-v3_9_0.xsd b/v3_9_0/CDT-svcFwWrapper-v3_9_0.xsd
index b4f8edb9ffeea525ba85d005406d376456b56d8c..57a05a3146912e94934cbb2b82d6b0fc2db4e172 100644
--- a/v3_9_0/CDT-svcFwWrapper-v3_9_0.xsd
+++ b/v3_9_0/CDT-svcFwWrapper-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-svcObjWrapper-v3_9_0.xsd b/v3_9_0/CDT-svcObjWrapper-v3_9_0.xsd
index 0c81db5a807dab1126a29e7bd47e38c9672bd113..2e1bf7105a3a6e1bf4b58a4a73243f2abd1f1332 100644
--- a/v3_9_0/CDT-svcObjWrapper-v3_9_0.xsd
+++ b/v3_9_0/CDT-svcObjWrapper-v3_9_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_8_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_9_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-timeSeries-v3_9_0.xsd b/v3_9_0/CDT-timeSeries-v3_9_0.xsd
index b3b28646db61bd2a91e41e8d3564224cac4dde5e..6ed8fc1fe9c09cbf519ec8078a432b7065462960 100644
--- a/v3_9_0/CDT-timeSeries-v3_9_0.xsd
+++ b/v3_9_0/CDT-timeSeries-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_9_0/CDT-timeSeriesInstance-v3_9_0.xsd b/v3_9_0/CDT-timeSeriesInstance-v3_9_0.xsd
index b00bef9cb1687956da966ae0bf116a3793ab4e14..8bc80ab562efb3c3b944dfcbc1a151d0611e36ec 100644
--- a/v3_9_0/CDT-timeSeriesInstance-v3_9_0.xsd
+++ b/v3_9_0/CDT-timeSeriesInstance-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-token-v3_9_0.xsd b/v3_9_0/CDT-token-v3_9_0.xsd
index 6ae082c14bafc42fc20c12953c282677e1232706..a323433b0b6cb138a54c15aea2a03a51c7352620 100644
--- a/v3_9_0/CDT-token-v3_9_0.xsd
+++ b/v3_9_0/CDT-token-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_9_0/CDT-transaction-v3_9_0.xsd b/v3_9_0/CDT-transaction-v3_9_0.xsd
index 862335e98adb5a9f8c770d6099fbf27eb52a7ae0..5cb68f3e75242d31f8c0c711336620fe81056756 100644
--- a/v3_9_0/CDT-transaction-v3_9_0.xsd
+++ b/v3_9_0/CDT-transaction-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_9_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-transactionMgmt-v3_9_0.xsd b/v3_9_0/CDT-transactionMgmt-v3_9_0.xsd
index e68291861f2eae14d84aeeb195c695e9d4cb5aa8..fb6b2b678e502db9120715344d04492f61b604ce 100644
--- a/v3_9_0/CDT-transactionMgmt-v3_9_0.xsd
+++ b/v3_9_0/CDT-transactionMgmt-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_9_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_9_0/CDT-triggerRequest-v3_9_0.xsd b/v3_9_0/CDT-triggerRequest-v3_9_0.xsd
index 336cc926e2be3192d47e28586e9feceb868e0662..19c522e4d957e2a5fb9cfdfc921247658a0c0453 100644
--- a/v3_9_0/CDT-triggerRequest-v3_9_0.xsd
+++ b/v3_9_0/CDT-triggerRequest-v3_9_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_8_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>