From 01d57b43602de6b15917d5200fa5582e91f5d6f9 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Mon, 26 Nov 2018 17:38:37 +0100
Subject: [PATCH] updated schemaLocation attribute values

---
 v3_9_0/CDT-AE-v3_9_0.xsd                      | 30 +++---
 v3_9_0/CDT-AEContactList-v3_9_0.xsd           |  8 +-
 v3_9_0/CDT-AEContactListPerCSE-v3_9_0.xsd     |  2 +-
 v3_9_0/CDT-CSEBase-v3_9_0.xsd                 | 64 ++++++------
 v3_9_0/CDT-accessControlPolicy-v3_9_0.xsd     |  6 +-
 v3_9_0/CDT-activeCmdhPolicy-v3_9_0.xsd        |  2 +-
 v3_9_0/CDT-allJoynApp-v3_9_0.xsd              |  8 +-
 v3_9_0/CDT-allJoynInterface-v3_9_0.xsd        | 12 +--
 v3_9_0/CDT-allJoynMethod-v3_9_0.xsd           |  8 +-
 v3_9_0/CDT-allJoynMethodCall-v3_9_0.xsd       |  6 +-
 v3_9_0/CDT-allJoynProperty-v3_9_0.xsd         |  6 +-
 v3_9_0/CDT-allJoynSvcObject-v3_9_0.xsd        |  8 +-
 v3_9_0/CDT-areaNwkDeviceInfo-v3_9_0.xsd       |  4 +-
 v3_9_0/CDT-areaNwkInfo-v3_9_0.xsd             |  4 +-
 v3_9_0/CDT-authorizationDecision-v3_9_0.xsd   |  6 +-
 .../CDT-authorizationInformation-v3_9_0.xsd   | 10 +-
 v3_9_0/CDT-authorizationPolicy-v3_9_0.xsd     |  6 +-
 v3_9_0/CDT-backgroundDataTransfer-v3_9_0.xsd  |  4 +-
 v3_9_0/CDT-battery-v3_9_0.xsd                 |  4 +-
 v3_9_0/CDT-cmdhBuffer-v3_9_0.xsd              |  2 +-
 v3_9_0/CDT-cmdhDefEcValue-v3_9_0.xsd          |  2 +-
 v3_9_0/CDT-cmdhDefaults-v3_9_0.xsd            |  2 +-
 v3_9_0/CDT-cmdhEcDefParamValues-v3_9_0.xsd    |  2 +-
 v3_9_0/CDT-cmdhLimits-v3_9_0.xsd              |  2 +-
 v3_9_0/CDT-cmdhNetworkAccessRules-v3_9_0.xsd  |  2 +-
 v3_9_0/CDT-cmdhNwAccessRule-v3_9_0.xsd        |  2 +-
 v3_9_0/CDT-cmdhPolicy-v3_9_0.xsd              |  2 +-
 v3_9_0/CDT-commonTypes-v3_9_0.xsd             |  2 +-
 v3_9_0/CDT-container-v3_9_0.xsd               | 12 +--
 v3_9_0/CDT-contentInstance-v3_9_0.xsd         |  6 +-
 .../CDT-crossResourceSubscription-v3_9_0.xsd  |  8 +-
 v3_9_0/CDT-delivery-v3_9_0.xsd                |  4 +-
 v3_9_0/CDT-deviceCapability-v3_9_0.xsd        |  4 +-
 v3_9_0/CDT-deviceInfo-v3_9_0.xsd              |  4 +-
 ...ynamicAuthorizationConsultation-v3_9_0.xsd |  6 +-
 v3_9_0/CDT-eventConfig-v3_9_0.xsd             |  6 +-
 v3_9_0/CDT-eventLog-v3_9_0.xsd                |  4 +-
 v3_9_0/CDT-execInstance-v3_9_0.xsd            |  6 +-
 v3_9_0/CDT-firmware-v3_9_0.xsd                |  4 +-
 ...icInterworkingOperationInstance-v3_9_0.xsd |  6 +-
 .../CDT-genericInterworkingService-v3_9_0.xsd |  8 +-
 v3_9_0/CDT-group-v3_9_0.xsd                   |  8 +-
 v3_9_0/CDT-localMulticastGroup-v3_9_0.xsd     |  4 +-
 v3_9_0/CDT-locationPolicy-v3_9_0.xsd          |  6 +-
 ...T-m2mServiceSubscriptionProfile-v3_9_0.xsd |  8 +-
 v3_9_0/CDT-memory-v3_9_0.xsd                  |  4 +-
 v3_9_0/CDT-mgmtCmd-v3_9_0.xsd                 |  8 +-
 v3_9_0/CDT-multimediaSession-v3_9_0.xsd       |  8 +-
 v3_9_0/CDT-node-v3_9_0.xsd                    | 32 +++---
 v3_9_0/CDT-notification-v3_9_0.xsd            |  4 +-
 ...notificationTargetMgmtPolicyRef-v3_9_0.xsd |  6 +-
 .../CDT-notificationTargetPolicy-v3_9_0.xsd   |  8 +-
 v3_9_0/CDT-ontology-v3_9_0.xsd                |  6 +-
 v3_9_0/CDT-ontologyRepository-v3_9_0.xsd      |  8 +-
 v3_9_0/CDT-policyDeletionRules-v3_9_0.xsd     |  6 +-
 v3_9_0/CDT-pollingChannel-v3_9_0.xsd          |  6 +-
 v3_9_0/CDT-reboot-v3_9_0.xsd                  |  4 +-
 v3_9_0/CDT-remoteCSE-v3_9_0.xsd               | 34 +++----
 v3_9_0/CDT-request-v3_9_0.xsd                 |  4 +-
 v3_9_0/CDT-requestPrimitive-v3_9_0.xsd        |  2 +-
 v3_9_0/CDT-responsePrimitive-v3_9_0.xsd       | 98 +++++++++----------
 v3_9_0/CDT-role-v3_9_0.xsd                    |  6 +-
 v3_9_0/CDT-schedule-v3_9_0.xsd                |  4 +-
 v3_9_0/CDT-semanticDescriptor-v3_9_0.xsd      |  6 +-
 v3_9_0/CDT-semanticMashupInstance-v3_9_0.xsd  | 10 +-
 .../CDT-semanticMashupJobProfile-v3_9_0.xsd   | 10 +-
 v3_9_0/CDT-semanticMashupResult-v3_9_0.xsd    |  6 +-
 .../CDT-serviceSubscribedAppRule-v3_9_0.xsd   |  6 +-
 v3_9_0/CDT-serviceSubscribedNode-v3_9_0.xsd   |  6 +-
 v3_9_0/CDT-software-v3_9_0.xsd                |  4 +-
 v3_9_0/CDT-statsCollect-v3_9_0.xsd            |  6 +-
 v3_9_0/CDT-statsConfig-v3_9_0.xsd             |  8 +-
 v3_9_0/CDT-subscription-v3_9_0.xsd            |  8 +-
 v3_9_0/CDT-svcFwWrapper-v3_9_0.xsd            |  6 +-
 v3_9_0/CDT-svcObjWrapper-v3_9_0.xsd           |  8 +-
 v3_9_0/CDT-timeSeries-v3_9_0.xsd              | 10 +-
 v3_9_0/CDT-timeSeriesInstance-v3_9_0.xsd      |  6 +-
 v3_9_0/CDT-token-v3_9_0.xsd                   |  6 +-
 v3_9_0/CDT-transaction-v3_9_0.xsd             |  6 +-
 v3_9_0/CDT-transactionMgmt-v3_9_0.xsd         |  6 +-
 v3_9_0/CDT-triggerRequest-v3_9_0.xsd          |  6 +-
 81 files changed, 346 insertions(+), 346 deletions(-)

diff --git a/v3_9_0/CDT-AE-v3_9_0.xsd b/v3_9_0/CDT-AE-v3_9_0.xsd
index dc6e9ed..db2a4ca 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 d57eba0..4409640 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 026dc1d..10387b2 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 579e997..1cce533 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 c474b05..66225d7 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 0b53230..416c49c 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 fe21efe..9c95c31 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 5c1cac4..02508ce 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 dde96d7..8efb57e 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 0a783ed..93b6e73 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 f70100b..fb300bc 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 49bbdc8..677f365 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 60c8bca..b01bdc1 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 1475cac..7555074 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 0c44f8a..10234e1 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 4e075e5..1d2ae44 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 2c386a0..109e486 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 22d5d4c..6ea5022 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 56f5304..5201a53 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 ca3a29c..e47a5f2 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 83d40d4..1467753 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 3e788d2..411ab32 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 bcdaf2d..95bc3f8 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 f5d72b5..1eb0fb6 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 9960563..834561c 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 3bcb3c7..0b05a57 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 b4a26ab..45b513e 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 fb62aed..d34972f 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 c51b7d2..36bd472 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 b08911d..3df7661 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 e7c6f14..963d5d8 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 588989d..0341af8 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 9b3b644..28e79e1 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 f8a7e6c..50ca3a3 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 48d8699..7bb4fd0 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 1ef2592..0a0dd2f 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 f717659..13fe7f7 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 963f97f..59e9f6b 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 6ea71a6..5f959ce 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 ac9b231..a767231 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 5a12b24..a13b506 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 54d38e7..f124fe6 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 98dd2b6..428b6f9 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 1f88405..b2cc258 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 e07689c..3fbcbbe 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 7167f41..109c70d 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 beecdb7..7d37209 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 ca5a1d5..b764a7b 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 eb9e7c6..3fe1859 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 85c0799..68f6656 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 59cbc94..48f85cf 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 a62f933..d362a6f 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 c4bd448..81bfdbd 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 fc08b45..7a3ae54 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 5a94943..b98f1ef 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 f13823e..b18f370 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 1a78ec7..d1fe6bf 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 66f4cfc..d79392f 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 9c0f393..2620831 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 dc60acc..daceb8b 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 4b36072..9d0fb38 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 290c99e..66225e0 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 be888bb..039e2e6 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 112e576..817a002 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 6991e92..af1ecf9 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 dee5084..0671ee7 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 8743f9a..185ff15 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 df0b333..339849c 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 dfe8296..dacfa3c 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 2c70561..b34809b 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 2bcd9d7..a0f5905 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 7432f11..2b391f2 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 f743ea1..300a155 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 b4f8edb..57a05a3 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 0c81db5..2e1bf71 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 b3b2864..6ed8fc1 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 b00bef9..8bc80ab 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 6ae082c..a323433 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 862335e..5cb68f3 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 e682918..fb6b2b6 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 336cc92..19c522e 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>
-- 
GitLab