From e658e77cb24faa681ec4c8f2d2db631668af184a Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Fri, 2 Jun 2017 16:03:47 +0200
Subject: [PATCH] updated schemaLocation attribute values

---
 v2_12_0/CDT-AE-v2_12_0.xsd                    |  20 +--
 v2_12_0/CDT-CSEBase-v2_12_0.xsd               |  40 ++---
 v2_12_0/CDT-accessControlPolicy-v2_12_0.xsd   |   4 +-
 v2_12_0/CDT-activeCmdhPolicy-v2_12_0.xsd      |   2 +-
 v2_12_0/CDT-allJoynApp-v2_12_0.xsd            |   8 +-
 v2_12_0/CDT-allJoynInterface-v2_12_0.xsd      |  12 +-
 v2_12_0/CDT-allJoynMethod-v2_12_0.xsd         |   8 +-
 v2_12_0/CDT-allJoynMethodCall-v2_12_0.xsd     |   6 +-
 v2_12_0/CDT-allJoynProperty-v2_12_0.xsd       |   6 +-
 v2_12_0/CDT-allJoynSvcObject-v2_12_0.xsd      |   8 +-
 v2_12_0/CDT-areaNwkDeviceInfo-v2_12_0.xsd     |   4 +-
 v2_12_0/CDT-areaNwkInfo-v2_12_0.xsd           |   4 +-
 v2_12_0/CDT-battery-v2_12_0.xsd               |   4 +-
 v2_12_0/CDT-cmdhBuffer-v2_12_0.xsd            |   2 +-
 v2_12_0/CDT-cmdhDefEcValue-v2_12_0.xsd        |   2 +-
 v2_12_0/CDT-cmdhDefaults-v2_12_0.xsd          |   2 +-
 v2_12_0/CDT-cmdhEcDefParamValues-v2_12_0.xsd  |   2 +-
 v2_12_0/CDT-cmdhLimits-v2_12_0.xsd            |   2 +-
 .../CDT-cmdhNetworkAccessRules-v2_12_0.xsd    |   2 +-
 v2_12_0/CDT-cmdhNwAccessRule-v2_12_0.xsd      |   2 +-
 v2_12_0/CDT-cmdhPolicy-v2_12_0.xsd            |   2 +-
 v2_12_0/CDT-commonTypes-v2_12_0.xsd           |   2 +-
 v2_12_0/CDT-container-v2_12_0.xsd             |   8 +-
 v2_12_0/CDT-contentInstance-v2_12_0.xsd       |   4 +-
 v2_12_0/CDT-delivery-v2_12_0.xsd              |   4 +-
 v2_12_0/CDT-deviceCapability-v2_12_0.xsd      |   4 +-
 v2_12_0/CDT-deviceInfo-v2_12_0.xsd            |   4 +-
 ...namicAuthorizationConsultation-v2_12_0.xsd |   2 +-
 v2_12_0/CDT-eventConfig-v2_12_0.xsd           |   4 +-
 v2_12_0/CDT-eventLog-v2_12_0.xsd              |   4 +-
 v2_12_0/CDT-execInstance-v2_12_0.xsd          |   4 +-
 v2_12_0/CDT-firmware-v2_12_0.xsd              |   4 +-
 ...cInterworkingOperationInstance-v2_12_0.xsd |   6 +-
 ...CDT-genericInterworkingService-v2_12_0.xsd |   8 +-
 v2_12_0/CDT-group-v2_12_0.xsd                 |   6 +-
 v2_12_0/CDT-locationPolicy-v2_12_0.xsd        |   4 +-
 ...-m2mServiceSubscriptionProfile-v2_12_0.xsd |   6 +-
 v2_12_0/CDT-memory-v2_12_0.xsd                |   4 +-
 v2_12_0/CDT-mgmtCmd-v2_12_0.xsd               |   6 +-
 v2_12_0/CDT-node-v2_12_0.xsd                  |  32 ++--
 v2_12_0/CDT-notification-v2_12_0.xsd          |   4 +-
 ...otificationTargetMgmtPolicyRef-v2_12_0.xsd |   4 +-
 .../CDT-notificationTargetPolicy-v2_12_0.xsd  |   6 +-
 v2_12_0/CDT-policyDeletionRules-v2_12_0.xsd   |   4 +-
 v2_12_0/CDT-pollingChannel-v2_12_0.xsd        |   4 +-
 v2_12_0/CDT-reboot-v2_12_0.xsd                |   4 +-
 v2_12_0/CDT-remoteCSE-v2_12_0.xsd             |  22 +--
 v2_12_0/CDT-request-v2_12_0.xsd               |   4 +-
 v2_12_0/CDT-requestPrimitive-v2_12_0.xsd      |   2 +-
 v2_12_0/CDT-responsePrimitive-v2_12_0.xsd     |  98 ++++++------
 v2_12_0/CDT-role-v2_12_0.xsd                  |   2 +-
 v2_12_0/CDT-schedule-v2_12_0.xsd              |   4 +-
 v2_12_0/CDT-semanticDescriptor-v2_12_0.xsd    |   4 +-
 .../CDT-serviceSubscribedAppRule-v2_12_0.xsd  |   4 +-
 v2_12_0/CDT-serviceSubscribedNode-v2_12_0.xsd |   4 +-
 v2_12_0/CDT-software-v2_12_0.xsd              |   4 +-
 v2_12_0/CDT-statsCollect-v2_12_0.xsd          |   4 +-
 v2_12_0/CDT-statsConfig-v2_12_0.xsd           |   6 +-
 v2_12_0/CDT-subscription-v2_12_0.xsd          |   6 +-
 v2_12_0/CDT-svcFwWrapper-v2_12_0.xsd          |   6 +-
 v2_12_0/CDT-svcObjWrapper-v2_12_0.xsd         |   8 +-
 v2_12_0/CDT-timeSeries-v2_12_0.xsd            |   8 +-
 v2_12_0/CDT-timeSeriesInstance-v2_12_0.xsd    |   2 +-
 v2_12_0/CDT-token-v2_12_0.xsd                 |   2 +-
 v2_12_0/CDT-trafficPattern-v2_12_0.xsd        |   6 +-
 v2_7_0/CDT-requestPrimitive-v2_7_0.xsd        | 148 +++++++++---------
 66 files changed, 314 insertions(+), 314 deletions(-)

diff --git a/v2_12_0/CDT-AE-v2_12_0.xsd b/v2_12_0/CDT-AE-v2_12_0.xsd
index c94ab0f..eafa567 100644
--- a/v2_12_0/CDT-AE-v2_12_0.xsd
+++ b/v2_12_0/CDT-AE-v2_12_0.xsd
@@ -26,16 +26,16 @@ 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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_12_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-CSEBase-v2_12_0.xsd b/v2_12_0/CDT-CSEBase-v2_12_0.xsd
index ea639f5..dd32d1f 100644
--- a/v2_12_0/CDT-CSEBase-v2_12_0.xsd
+++ b/v2_12_0/CDT-CSEBase-v2_12_0.xsd
@@ -26,26 +26,26 @@ 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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_11_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_11_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_12_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_12_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_12_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-accessControlPolicy-v2_12_0.xsd b/v2_12_0/CDT-accessControlPolicy-v2_12_0.xsd
index afad18d..a4b0826 100644
--- a/v2_12_0/CDT-accessControlPolicy-v2_12_0.xsd
+++ b/v2_12_0/CDT-accessControlPolicy-v2_12_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:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-activeCmdhPolicy-v2_12_0.xsd b/v2_12_0/CDT-activeCmdhPolicy-v2_12_0.xsd
index e8b3cea..17bb7b9 100644
--- a/v2_12_0/CDT-activeCmdhPolicy-v2_12_0.xsd
+++ b/v2_12_0/CDT-activeCmdhPolicy-v2_12_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-v2_11_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_12_0/CDT-allJoynApp-v2_12_0.xsd b/v2_12_0/CDT-allJoynApp-v2_12_0.xsd
index e082a01..f7e6be6 100644
--- a/v2_12_0/CDT-allJoynApp-v2_12_0.xsd
+++ b/v2_12_0/CDT-allJoynApp-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_12_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-allJoynInterface-v2_12_0.xsd b/v2_12_0/CDT-allJoynInterface-v2_12_0.xsd
index dfae0c5..dd977f5 100644
--- a/v2_12_0/CDT-allJoynInterface-v2_12_0.xsd
+++ b/v2_12_0/CDT-allJoynInterface-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_12_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_12_0/CDT-allJoynMethod-v2_12_0.xsd b/v2_12_0/CDT-allJoynMethod-v2_12_0.xsd
index d98d80c..9e80711 100644
--- a/v2_12_0/CDT-allJoynMethod-v2_12_0.xsd
+++ b/v2_12_0/CDT-allJoynMethod-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_12_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_12_0/CDT-allJoynMethodCall-v2_12_0.xsd b/v2_12_0/CDT-allJoynMethodCall-v2_12_0.xsd
index d79846a..697cc0f 100644
--- a/v2_12_0/CDT-allJoynMethodCall-v2_12_0.xsd
+++ b/v2_12_0/CDT-allJoynMethodCall-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-allJoynProperty-v2_12_0.xsd b/v2_12_0/CDT-allJoynProperty-v2_12_0.xsd
index 085ab66..52f1d51 100644
--- a/v2_12_0/CDT-allJoynProperty-v2_12_0.xsd
+++ b/v2_12_0/CDT-allJoynProperty-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-allJoynSvcObject-v2_12_0.xsd b/v2_12_0/CDT-allJoynSvcObject-v2_12_0.xsd
index 1eda7d2..960cb35 100644
--- a/v2_12_0/CDT-allJoynSvcObject-v2_12_0.xsd
+++ b/v2_12_0/CDT-allJoynSvcObject-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_12_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-areaNwkDeviceInfo-v2_12_0.xsd b/v2_12_0/CDT-areaNwkDeviceInfo-v2_12_0.xsd
index 479c86d..bc433a6 100644
--- a/v2_12_0/CDT-areaNwkDeviceInfo-v2_12_0.xsd
+++ b/v2_12_0/CDT-areaNwkDeviceInfo-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-areaNwkInfo-v2_12_0.xsd b/v2_12_0/CDT-areaNwkInfo-v2_12_0.xsd
index 1c5872a..94156d1 100644
--- a/v2_12_0/CDT-areaNwkInfo-v2_12_0.xsd
+++ b/v2_12_0/CDT-areaNwkInfo-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-battery-v2_12_0.xsd b/v2_12_0/CDT-battery-v2_12_0.xsd
index fd97498..9265d9e 100644
--- a/v2_12_0/CDT-battery-v2_12_0.xsd
+++ b/v2_12_0/CDT-battery-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-cmdhBuffer-v2_12_0.xsd b/v2_12_0/CDT-cmdhBuffer-v2_12_0.xsd
index 085d09a..5c6d7a1 100644
--- a/v2_12_0/CDT-cmdhBuffer-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhBuffer-v2_12_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-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_12_0/CDT-cmdhDefEcValue-v2_12_0.xsd b/v2_12_0/CDT-cmdhDefEcValue-v2_12_0.xsd
index 8e2a1df..30bb51b 100644
--- a/v2_12_0/CDT-cmdhDefEcValue-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhDefEcValue-v2_12_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-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_12_0/CDT-cmdhDefaults-v2_12_0.xsd b/v2_12_0/CDT-cmdhDefaults-v2_12_0.xsd
index ea8cb74..1e7a169 100644
--- a/v2_12_0/CDT-cmdhDefaults-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhDefaults-v2_12_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-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_12_0/CDT-cmdhEcDefParamValues-v2_12_0.xsd b/v2_12_0/CDT-cmdhEcDefParamValues-v2_12_0.xsd
index d3ebdc2..c872aeb 100644
--- a/v2_12_0/CDT-cmdhEcDefParamValues-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhEcDefParamValues-v2_12_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-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_12_0/CDT-cmdhLimits-v2_12_0.xsd b/v2_12_0/CDT-cmdhLimits-v2_12_0.xsd
index f7ba749..d3db0d9 100644
--- a/v2_12_0/CDT-cmdhLimits-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhLimits-v2_12_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-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_12_0/CDT-cmdhNetworkAccessRules-v2_12_0.xsd b/v2_12_0/CDT-cmdhNetworkAccessRules-v2_12_0.xsd
index 77396fc..edd245d 100644
--- a/v2_12_0/CDT-cmdhNetworkAccessRules-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhNetworkAccessRules-v2_12_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-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_12_0/CDT-cmdhNwAccessRule-v2_12_0.xsd b/v2_12_0/CDT-cmdhNwAccessRule-v2_12_0.xsd
index ac9e4c0..4f098de 100644
--- a/v2_12_0/CDT-cmdhNwAccessRule-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhNwAccessRule-v2_12_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-v2_11_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_12_0/CDT-cmdhPolicy-v2_12_0.xsd b/v2_12_0/CDT-cmdhPolicy-v2_12_0.xsd
index 5a52d67..d02742b 100644
--- a/v2_12_0/CDT-cmdhPolicy-v2_12_0.xsd
+++ b/v2_12_0/CDT-cmdhPolicy-v2_12_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-v2_11_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_12_0/CDT-commonTypes-v2_12_0.xsd b/v2_12_0/CDT-commonTypes-v2_12_0.xsd
index 513af16..f422b79 100644
--- a/v2_12_0/CDT-commonTypes-v2_12_0.xsd
+++ b/v2_12_0/CDT-commonTypes-v2_12_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-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_12_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_12_0/CDT-container-v2_12_0.xsd b/v2_12_0/CDT-container-v2_12_0.xsd
index 8e92ab5..b91ddc4 100644
--- a/v2_12_0/CDT-container-v2_12_0.xsd
+++ b/v2_12_0/CDT-container-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_12_0/CDT-contentInstance-v2_12_0.xsd b/v2_12_0/CDT-contentInstance-v2_12_0.xsd
index 04d1733..a5be82a 100644
--- a/v2_12_0/CDT-contentInstance-v2_12_0.xsd
+++ b/v2_12_0/CDT-contentInstance-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-delivery-v2_12_0.xsd b/v2_12_0/CDT-delivery-v2_12_0.xsd
index 0a513db..809c040 100644
--- a/v2_12_0/CDT-delivery-v2_12_0.xsd
+++ b/v2_12_0/CDT-delivery-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_12_0/CDT-deviceCapability-v2_12_0.xsd b/v2_12_0/CDT-deviceCapability-v2_12_0.xsd
index 756fd2d..1e3fbf5 100644
--- a/v2_12_0/CDT-deviceCapability-v2_12_0.xsd
+++ b/v2_12_0/CDT-deviceCapability-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-deviceInfo-v2_12_0.xsd b/v2_12_0/CDT-deviceInfo-v2_12_0.xsd
index 33953c4..1468f5c 100644
--- a/v2_12_0/CDT-deviceInfo-v2_12_0.xsd
+++ b/v2_12_0/CDT-deviceInfo-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-dynamicAuthorizationConsultation-v2_12_0.xsd b/v2_12_0/CDT-dynamicAuthorizationConsultation-v2_12_0.xsd
index 7fab76e..c41eb1f 100644
--- a/v2_12_0/CDT-dynamicAuthorizationConsultation-v2_12_0.xsd
+++ b/v2_12_0/CDT-dynamicAuthorizationConsultation-v2_12_0.xsd
@@ -26,7 +26,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-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-eventConfig-v2_12_0.xsd b/v2_12_0/CDT-eventConfig-v2_12_0.xsd
index 3761a8e..d2b224b 100644
--- a/v2_12_0/CDT-eventConfig-v2_12_0.xsd
+++ b/v2_12_0/CDT-eventConfig-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-eventLog-v2_12_0.xsd b/v2_12_0/CDT-eventLog-v2_12_0.xsd
index a07ff2d..513a21d 100644
--- a/v2_12_0/CDT-eventLog-v2_12_0.xsd
+++ b/v2_12_0/CDT-eventLog-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-execInstance-v2_12_0.xsd b/v2_12_0/CDT-execInstance-v2_12_0.xsd
index 992630f..d1094af 100644
--- a/v2_12_0/CDT-execInstance-v2_12_0.xsd
+++ b/v2_12_0/CDT-execInstance-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-firmware-v2_12_0.xsd b/v2_12_0/CDT-firmware-v2_12_0.xsd
index 84fcdd7..f9d80dc 100644
--- a/v2_12_0/CDT-firmware-v2_12_0.xsd
+++ b/v2_12_0/CDT-firmware-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-genericInterworkingOperationInstance-v2_12_0.xsd b/v2_12_0/CDT-genericInterworkingOperationInstance-v2_12_0.xsd
index 9e07feb..1aecdd0 100644
--- a/v2_12_0/CDT-genericInterworkingOperationInstance-v2_12_0.xsd
+++ b/v2_12_0/CDT-genericInterworkingOperationInstance-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-genericInterworkingService-v2_12_0.xsd b/v2_12_0/CDT-genericInterworkingService-v2_12_0.xsd
index f19ff22..93fc89a 100644
--- a/v2_12_0/CDT-genericInterworkingService-v2_12_0.xsd
+++ b/v2_12_0/CDT-genericInterworkingService-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_12_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-group-v2_12_0.xsd b/v2_12_0/CDT-group-v2_12_0.xsd
index 5d4c71e..63699bf 100644
--- a/v2_12_0/CDT-group-v2_12_0.xsd
+++ b/v2_12_0/CDT-group-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-locationPolicy-v2_12_0.xsd b/v2_12_0/CDT-locationPolicy-v2_12_0.xsd
index 4d7107f..3291bad 100644
--- a/v2_12_0/CDT-locationPolicy-v2_12_0.xsd
+++ b/v2_12_0/CDT-locationPolicy-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-m2mServiceSubscriptionProfile-v2_12_0.xsd b/v2_12_0/CDT-m2mServiceSubscriptionProfile-v2_12_0.xsd
index d5744e1..fd88a98 100644
--- a/v2_12_0/CDT-m2mServiceSubscriptionProfile-v2_12_0.xsd
+++ b/v2_12_0/CDT-m2mServiceSubscriptionProfile-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_12_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-memory-v2_12_0.xsd b/v2_12_0/CDT-memory-v2_12_0.xsd
index 0d628d1..5eaa234 100644
--- a/v2_12_0/CDT-memory-v2_12_0.xsd
+++ b/v2_12_0/CDT-memory-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-mgmtCmd-v2_12_0.xsd b/v2_12_0/CDT-mgmtCmd-v2_12_0.xsd
index 2fc6c78..57de1c4 100644
--- a/v2_12_0/CDT-mgmtCmd-v2_12_0.xsd
+++ b/v2_12_0/CDT-mgmtCmd-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_12_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-node-v2_12_0.xsd b/v2_12_0/CDT-node-v2_12_0.xsd
index 2a25820..f6499e8 100644
--- a/v2_12_0/CDT-node-v2_12_0.xsd
+++ b/v2_12_0/CDT-node-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_12_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-notification-v2_12_0.xsd b/v2_12_0/CDT-notification-v2_12_0.xsd
index 47a67b2..d676131 100644
--- a/v2_12_0/CDT-notification-v2_12_0.xsd
+++ b/v2_12_0/CDT-notification-v2_12_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-v2_11_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_11_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_12_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_12_0/CDT-notificationTargetMgmtPolicyRef-v2_12_0.xsd b/v2_12_0/CDT-notificationTargetMgmtPolicyRef-v2_12_0.xsd
index e5dbc09..f98fc70 100644
--- a/v2_12_0/CDT-notificationTargetMgmtPolicyRef-v2_12_0.xsd
+++ b/v2_12_0/CDT-notificationTargetMgmtPolicyRef-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-notificationTargetPolicy-v2_12_0.xsd b/v2_12_0/CDT-notificationTargetPolicy-v2_12_0.xsd
index 87e2874..64c7350 100644
--- a/v2_12_0/CDT-notificationTargetPolicy-v2_12_0.xsd
+++ b/v2_12_0/CDT-notificationTargetPolicy-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-policyDeletionRules-v2_12_0.xsd b/v2_12_0/CDT-policyDeletionRules-v2_12_0.xsd
index 6668873..e87d3ab 100644
--- a/v2_12_0/CDT-policyDeletionRules-v2_12_0.xsd
+++ b/v2_12_0/CDT-policyDeletionRules-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-pollingChannel-v2_12_0.xsd b/v2_12_0/CDT-pollingChannel-v2_12_0.xsd
index acc6449..2597ce7 100644
--- a/v2_12_0/CDT-pollingChannel-v2_12_0.xsd
+++ b/v2_12_0/CDT-pollingChannel-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-reboot-v2_12_0.xsd b/v2_12_0/CDT-reboot-v2_12_0.xsd
index 1725de0..fa6154c 100644
--- a/v2_12_0/CDT-reboot-v2_12_0.xsd
+++ b/v2_12_0/CDT-reboot-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-remoteCSE-v2_12_0.xsd b/v2_12_0/CDT-remoteCSE-v2_12_0.xsd
index 743664b..fc43572 100644
--- a/v2_12_0/CDT-remoteCSE-v2_12_0.xsd
+++ b/v2_12_0/CDT-remoteCSE-v2_12_0.xsd
@@ -26,17 +26,17 @@ 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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_12_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-request-v2_12_0.xsd b/v2_12_0/CDT-request-v2_12_0.xsd
index 3da67e4..2199c7d 100644
--- a/v2_12_0/CDT-request-v2_12_0.xsd
+++ b/v2_12_0/CDT-request-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-requestPrimitive-v2_12_0.xsd b/v2_12_0/CDT-requestPrimitive-v2_12_0.xsd
index 64b93ad..e6d25cb 100644
--- a/v2_12_0/CDT-requestPrimitive-v2_12_0.xsd
+++ b/v2_12_0/CDT-requestPrimitive-v2_12_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-v2_11_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_12_0/CDT-responsePrimitive-v2_12_0.xsd b/v2_12_0/CDT-responsePrimitive-v2_12_0.xsd
index 7b9b33a..079c02d 100644
--- a/v2_12_0/CDT-responsePrimitive-v2_12_0.xsd
+++ b/v2_12_0/CDT-responsePrimitive-v2_12_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-v2_11_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_11_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_11_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_12_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_12_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_12_0/CDT-role-v2_12_0.xsd b/v2_12_0/CDT-role-v2_12_0.xsd
index db6924a..164ddd0 100644
--- a/v2_12_0/CDT-role-v2_12_0.xsd
+++ b/v2_12_0/CDT-role-v2_12_0.xsd
@@ -26,7 +26,7 @@ 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-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-schedule-v2_12_0.xsd b/v2_12_0/CDT-schedule-v2_12_0.xsd
index 283e5d6..a6650e8 100644
--- a/v2_12_0/CDT-schedule-v2_12_0.xsd
+++ b/v2_12_0/CDT-schedule-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-semanticDescriptor-v2_12_0.xsd b/v2_12_0/CDT-semanticDescriptor-v2_12_0.xsd
index 53befe7..24a3c72 100644
--- a/v2_12_0/CDT-semanticDescriptor-v2_12_0.xsd
+++ b/v2_12_0/CDT-semanticDescriptor-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-serviceSubscribedAppRule-v2_12_0.xsd b/v2_12_0/CDT-serviceSubscribedAppRule-v2_12_0.xsd
index b3ab9e7..b80a2f4 100644
--- a/v2_12_0/CDT-serviceSubscribedAppRule-v2_12_0.xsd
+++ b/v2_12_0/CDT-serviceSubscribedAppRule-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-serviceSubscribedNode-v2_12_0.xsd b/v2_12_0/CDT-serviceSubscribedNode-v2_12_0.xsd
index 77b0560..ecde977 100644
--- a/v2_12_0/CDT-serviceSubscribedNode-v2_12_0.xsd
+++ b/v2_12_0/CDT-serviceSubscribedNode-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-software-v2_12_0.xsd b/v2_12_0/CDT-software-v2_12_0.xsd
index 498c3de..a7ad4e7 100644
--- a/v2_12_0/CDT-software-v2_12_0.xsd
+++ b/v2_12_0/CDT-software-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-statsCollect-v2_12_0.xsd b/v2_12_0/CDT-statsCollect-v2_12_0.xsd
index 47e695b..d8b507b 100644
--- a/v2_12_0/CDT-statsCollect-v2_12_0.xsd
+++ b/v2_12_0/CDT-statsCollect-v2_12_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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-statsConfig-v2_12_0.xsd b/v2_12_0/CDT-statsConfig-v2_12_0.xsd
index 1553d8a..13341e0 100644
--- a/v2_12_0/CDT-statsConfig-v2_12_0.xsd
+++ b/v2_12_0/CDT-statsConfig-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-subscription-v2_12_0.xsd b/v2_12_0/CDT-subscription-v2_12_0.xsd
index 44d9572..8c503b1 100644
--- a/v2_12_0/CDT-subscription-v2_12_0.xsd
+++ b/v2_12_0/CDT-subscription-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_12_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-svcFwWrapper-v2_12_0.xsd b/v2_12_0/CDT-svcFwWrapper-v2_12_0.xsd
index 85dc0c2..25adfa4 100644
--- a/v2_12_0/CDT-svcFwWrapper-v2_12_0.xsd
+++ b/v2_12_0/CDT-svcFwWrapper-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-svcObjWrapper-v2_12_0.xsd b/v2_12_0/CDT-svcObjWrapper-v2_12_0.xsd
index dc39e8a..2a9c05e 100644
--- a/v2_12_0/CDT-svcObjWrapper-v2_12_0.xsd
+++ b/v2_12_0/CDT-svcObjWrapper-v2_12_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-v2_11_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_12_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-timeSeries-v2_12_0.xsd b/v2_12_0/CDT-timeSeries-v2_12_0.xsd
index 31bea92..bdfa2f9 100644
--- a/v2_12_0/CDT-timeSeries-v2_12_0.xsd
+++ b/v2_12_0/CDT-timeSeries-v2_12_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-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_12_0/CDT-timeSeriesInstance-v2_12_0.xsd b/v2_12_0/CDT-timeSeriesInstance-v2_12_0.xsd
index aad8573..1fd0594 100644
--- a/v2_12_0/CDT-timeSeriesInstance-v2_12_0.xsd
+++ b/v2_12_0/CDT-timeSeriesInstance-v2_12_0.xsd
@@ -26,7 +26,7 @@ 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-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-token-v2_12_0.xsd b/v2_12_0/CDT-token-v2_12_0.xsd
index 3839521..d6c2211 100644
--- a/v2_12_0/CDT-token-v2_12_0.xsd
+++ b/v2_12_0/CDT-token-v2_12_0.xsd
@@ -26,7 +26,7 @@ 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-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_12_0/CDT-trafficPattern-v2_12_0.xsd b/v2_12_0/CDT-trafficPattern-v2_12_0.xsd
index 4b07fd9..8819742 100644
--- a/v2_12_0/CDT-trafficPattern-v2_12_0.xsd
+++ b/v2_12_0/CDT-trafficPattern-v2_12_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_11_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_11_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd b/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd
index a83d70c..500a0e0 100644
--- a/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd
+++ b/v2_7_0/CDT-requestPrimitive-v2_7_0.xsd
@@ -28,81 +28,81 @@ 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-v2_7_0.xsd" /> 
-
-    <xs:element name="requestPrimitive" >
-      <xs:complexType>
-        <xs:sequence>
-          <!-- parameter "Operation"  -->
-          <xs:element name="operation" type="m2m:operation" minOccurs="1"/>
-          <!-- parameter "To" -->
-          <xs:element name="to" type="xs:anyURI" minOccurs="1"/>
-          <!-- parameter "From" -->
-          <xs:element name="from" type="m2m:ID" minOccurs="0"/>
-          <!-- parameter "Request Identifier" -->
-          <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
-          <!-- parameter "ResourceType" -->
-          <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
-          <!-- parameter "Content" -->
-          <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/> 
-          <!-- parameter "Role IDs" -->
-          <xs:element name="roleIDs" minOccurs="0">      
-              <xs:simpleType>
-                <xs:restriction> 
-                  <xs:simpleType> 
-                    <xs:list itemType="m2m:roleID" /> 
-                  </xs:simpleType> 				
-                  <xs:minLength value="1" /> 
-                </xs:restriction> 
-              </xs:simpleType>
-          </xs:element>
-          
-          <!-- parameter "Originating Timestamp" -->
-          <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Request Expiration Timestamp" -->
-          <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Result Expiration Timestamp" -->
-          <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Operation Execution Time" -->
-          <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Response Type" -->
-          <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
-          <!-- parameter "Result Persistence" -->
-          <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0"/>
-          <!-- parameter "Result Content" -->
-          <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
-          <!-- parameter "Event Category" -->
-          <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
-          <!-- parameter "Delivery Aggregation" -->
-          <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter "Group Request Identifier" -->
-          <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>        
-          <!-- parameter "Filter Criteria" -->
-          <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
-          <!-- parameter "Discovery Result Type" -->
-          <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
-          <!-- parameter "Tokens" -->
-          <xs:element name="tokens" type="m2m:dynAuthJWT" minOccurs="0"/> 
-          <!-- parameter "Token IDs" -->
-          <xs:element name="tokenIDs" type="m2m:tokenID" minOccurs="0"/>                   
-          <!-- parameter "Local Token IDs" -->
-          <xs:element name="localTokenIDs" minOccurs="0">
-            <xs:simpleType>
-              <xs:restriction> 
-                <xs:simpleType> 
-                  <xs:list itemType="xs:NCName" /> 
-                </xs:simpleType> 				
-                <xs:minLength value="1" /> 
-              </xs:restriction> 
-            </xs:simpleType>
-          </xs:element>
-          <!-- parameter "Token Request Indicator" -->
-          <xs:element name="tokenReqIndicator" type="xs:boolean" minOccurs="0"/>
-        </xs:sequence> 	       
-      </xs:complexType>
-    </xs:element>
+  <xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" /> 
+  
+  <xs:element name="requestPrimitive" >
+    <xs:complexType>
+      <xs:sequence>
+        <!-- parameter "Operation"  -->
+        <xs:element name="operation" type="m2m:operation" minOccurs="1"/>
+        <!-- parameter "To" -->
+        <xs:element name="to" type="xs:anyURI" minOccurs="1"/>
+        <!-- parameter "From" -->
+        <xs:element name="from" type="m2m:ID" minOccurs="0"/>
+        <!-- parameter "Request Identifier" -->
+        <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
+        <!-- parameter "ResourceType" -->
+        <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
+        <!-- parameter "Content" -->
+        <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/> 
+        <!-- parameter "Role IDs" -->
+        <xs:element name="roleIDs" minOccurs="0">      
+          <xs:simpleType>
+            <xs:restriction> 
+              <xs:simpleType> 
+                <xs:list itemType="m2m:roleID" /> 
+              </xs:simpleType> 				
+              <xs:minLength value="1" /> 
+            </xs:restriction> 
+          </xs:simpleType>
+        </xs:element>
+        
+        <!-- parameter "Originating Timestamp" -->
+        <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
+        <!-- parameter "Request Expiration Timestamp" -->
+        <xs:element name="requestExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
+        <!-- parameter "Result Expiration Timestamp" -->
+        <xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
+        <!-- parameter "Operation Execution Time" -->
+        <xs:element name="operationExecutionTime" type="m2m:absRelTimestamp" minOccurs="0"/>
+        <!-- parameter "Response Type" -->
+        <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
+        <!-- parameter "Result Persistence" -->
+        <xs:element name="resultPersistence" type="m2m:absRelTimestamp" minOccurs="0"/>
+        <!-- parameter "Result Content" -->
+        <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
+        <!-- parameter "Event Category" -->
+        <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
+        <!-- parameter "Delivery Aggregation" -->
+        <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
+        <!-- parameter "Group Request Identifier" -->
+        <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>        
+        <!-- parameter "Filter Criteria" -->
+        <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
+        <!-- parameter "Discovery Result Type" -->
+        <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
+        <!-- parameter "Tokens" -->
+        <xs:element name="tokens" type="m2m:dynAuthJWT" minOccurs="0"/> 
+        <!-- parameter "Token IDs" -->
+        <xs:element name="tokenIDs" type="m2m:tokenID" minOccurs="0"/>                   
+        <!-- parameter "Local Token IDs" -->
+        <xs:element name="localTokenIDs" minOccurs="0">
+          <xs:simpleType>
+            <xs:restriction> 
+              <xs:simpleType> 
+                <xs:list itemType="xs:NCName" /> 
+              </xs:simpleType> 				
+              <xs:minLength value="1" /> 
+            </xs:restriction> 
+          </xs:simpleType>
+        </xs:element>
+        <!-- parameter "Token Request Indicator" -->
+        <xs:element name="tokenReqIndicator" type="xs:boolean" minOccurs="0"/>
+      </xs:sequence> 	       
+    </xs:complexType>
+  </xs:element>
   
-    <xs:element name="attributeList" type="m2m:attributeList"  />
+  <xs:element name="attributeList" type="m2m:attributeList"  />
   
 </xs:schema> 
 
-- 
GitLab