diff --git a/v2_12_0/CDT-AE-v2_12_0.xsd b/v2_12_0/CDT-AE-v2_12_0.xsd
index c94ab0fd5a7c12f75abb406f658ace20f8b32a4e..eafa567239eb11fbce8379e71d5fb700bba57d5a 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 ea639f5acb33af8a83c262748f1f18cd8e5d9727..dd32d1f2feca9377fcbf8baca15a733dc55bfcdc 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 afad18d1846323ee095731ea746231ba5319323d..a4b0826fcb256e1f041c7017329210e021b29e4a 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 e8b3ceaa09209f24c834dd20aa87bf85e8fe2fca..17bb7b9eaaf73a03417cf5e88a8b4dd21ffe968e 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 e082a0100065c349352dab2411da9837b37f614b..f7e6be6ddc45409728c8d04a2acfeb58f880909b 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 dfae0c50456d4323ce4e31a86d75cae6eb2d516c..dd977f5efd8b58df3d08418684fd4630bfd62bef 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 d98d80c838c48d7929ad4367a9202d0a8e3d1641..9e80711ce5cc029d8dc2c913f51b0c72c0964df0 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 d79846a5e92090c97234406752a92cc6cbf68db3..697cc0fe6c1c9da9b8ff1eb29c6c26330340311c 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 085ab665239a536866f715ef090e7166b056a92d..52f1d5142ec58eeeae55dcba8edcf083bb34e027 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 1eda7d2705a4c7720200726596b4cd4cbe1180ea..960cb35813bdea53e65e675652e216bca4cd50fa 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 479c86d5714fc6f163a19a4b8707dab8c812e10c..bc433a6c98a84ad910790822e2ca6a5226d2ff10 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 1c5872a8bb1c9c6d0e83fcaf964bebbe53cf593d..94156d1f1261da3c3427878d5536146328fc8b2b 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 fd97498ceaccac6aa28f9da7eb07efffecfa8714..9265d9eb6fd68e3ddfd765d3024a968b199ad7f4 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 085d09a8a21f1b07f13ed323ed50d888808a1045..5c6d7a1f4e218216212a15f345cd0601b9b34a1a 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 8e2a1df24d3d8c917bff86bb3ced85f51b51b317..30bb51b22f99e284ed26034e2e4697511eb33139 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 ea8cb74aae2571a72a82b73ad8b6efed4f458502..1e7a169935bcfda9227bce17b53482c099b65838 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 d3ebdc229571afdc394f1c88ff045b509f65ca79..c872aebbb665a4562d0f0867c20217d84366f875 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 f7ba74926d1fbde34ab595e589b50577f62b474e..d3db0d9377769b725e180829ef96d308b520465d 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 77396fc3f7e4f810a87b5c8927da8835d4c1a3f1..edd245dfc5375e6ac715bfa864b58a3f9a424b9b 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 ac9e4c0805388e6fd9cd9619fa24a1bcefe0500b..4f098dec0145ad7fe19d4b20841af6c703b6ae26 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 5a52d677e609855d927805c706e62d49052621c1..d02742b1a9f6fe78fbcfd3b474b44f5c3a5cedfd 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 513af16b225ada6a03c0f7803cf4edd449edf89e..f422b79a2ee0250146473f0f119efa41ef66b27e 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 8e92ab55958b3bd94af13e170445c5291087f766..b91ddc4689e284df52466babad8a8b5de6b0498a 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 04d1733776530e80e92196c0a457c5973f4117cb..a5be82ad566b3a9395bbaf8f152ad51076165230 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 0a513db724ef8273a8f600d990343f7029fd4e48..809c040d8e58676a2d04c977ac234b6c6f860e0d 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 756fd2d0addd4cdae96fcda023899b6987aad86b..1e3fbf5edccd5aed1185c7da8a9492316b8b9d13 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 33953c46cf72945fd9c179eeda5e1c7b02d92251..1468f5c4f01a69dde16f6bff4ad8797f5f23a858 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 7fab76e32c3cf71e52a2844946e1a0d9d8b9aff5..c41eb1f6846a6aff7995bcaecbc2f448ba28b85d 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 3761a8e871aa0db9b0804c1894dd12b56b8c6180..d2b224b8c52d6c364d934118121706825742da86 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 a07ff2d4efcdf11b11dddc0f77762dfc4add308e..513a21db973b03b24a0bd6fe713e1f963fa71195 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 992630fa00723eb82d6087eaad9ec8ee8b24fdb7..d1094afed1cfb78bc3715e7e2b2a293a6cd35f7c 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 84fcdd77fd19cce0d2f607defcd7260d8e0b9385..f9d80dc1f6c34284d0e17125e29e630e9b23626c 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 9e07feb1f65ccde3c3cd3d4e0f6dbad09798e379..1aecdd05b80ca6c8ffdda30541b5f2384d3eb4b4 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 f19ff222510befdddb364ed4eb45a1e18bfddea1..93fc89ab59a44d147e7e8bdf75ed6efe32084d11 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 5d4c71e237cd0c5b4eb9b7218d05ba19c4dff09a..63699bf08775c53497d6e2116cc2983e4f60a26e 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 4d7107fbae5e60c9848384bd62dd6064be30cb32..3291bade5f27d0685c8d5d7ce6ead5e641d06a46 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 d5744e1f18568072318960fc86f92b590f4882b5..fd88a9835f774ee60ff68ccbc37ffa17bc5f4ab3 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 0d628d17d8deded9cb3f45019af3e471bf32fd5f..5eaa234eed01d78ee3cde22a30e6a6ab4f3464b8 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 2fc6c78c3dc4cbcbc70e2748f8ec842160a41e97..57de1c42678c0b5815d29d6fabc47bcd38c5abfe 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 2a2582022460d6998c6c5685b135f097125623e9..f6499e834e043eb34dbb1d0f1e72fce58d23bdf1 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 47a67b2567f03f0dd9fc2ef4c0394cb2843374c5..d676131599b8655a7afb37e04382ab2e0b48cb43 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 e5dbc0935da43672b443733223464ca361598c44..f98fc706bf58e7d4375833e1764602500ec1de09 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 87e2874b6ce15e40f83b0ef9b089c3efc87fa77c..64c73507f381f583f542a8b7f5bd45083929c70a 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 666887391c0bf78843f9b871b7a1a480d5207005..e87d3ab67c1b63688136273d1df3b40cfaf31a45 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 acc6449de7d915c12e9b426834b16ff58a37acd7..2597ce788fd50f812249a8ff5236fe862bfc9216 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 1725de0e05d8c9fe93b904a3cfab4de47b1f127d..fa6154c5c95b0abbace1539f6537d8421d6af7ae 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 743664b733476999f56c2079b632178e3cb55d85..fc435727bd69bcd4e5f66b2af9700c25ec9c76e2 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 3da67e401b37f3b7bfb1207711b2dbe206e88029..2199c7dbee7b7a170c6a69eca91a5cd13ce8ebef 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 64b93ad1d74ee7789ca67551a3ae3d35f80f6b72..e6d25cb77c65dbd74f48e4175ea4404d6910b7ca 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 7b9b33a33a7131b384119719267d51535c4bdf6d..079c02d6000af975d3dc9a61e5a55ea449508092 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 db6924a5b0275dab2783d69e538a10657487ed93..164ddd0726b85f650e8c8a0e68b2471d8b3c0e7f 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 283e5d6d8dc58ae24513de701795216f2419783d..a6650e8af51be6367f87f4f360e080a3cc1233c7 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 53befe75f73dd1a3549623fc25ce845f1e1d994e..24a3c72d422257f1bd4e510d1a62734300085bf7 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 b3ab9e71491eca2588540392def5714a3678a5ed..b80a2f45fd9ca808766f360f59fadd72232eabda 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 77b056012783d6509695c53ca54fba10839ac10f..ecde977cb7819bd8a4ced37c9edfc95cd4acba55 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 498c3deec46cfdb11ab526e2b776b1f0f63a9812..a7ad4e70b32d1070bfd7b2315949ed74b0bb7e57 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 47e695b3a5f917a801b2e6cdb75a94c5a882b921..d8b507b1b53eefd3962a143a5b295da5a1ca08f9 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 1553d8a58261ef80b7261ea8b3363e199f9f4cda..13341e03c1ca9c281853fff499d86e76bc8b44a6 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 44d957223a19dbdfcc380a457be0af47602c4fe3..8c503b101272a2b83d426c17523599d2f0e59e82 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 85dc0c246611d7ca42001e1ba8dfc5904129a6ec..25adfa4eb6161f267bc44e652459e434a20c0672 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 dc39e8ad9cf5941514559be3c7fd65a02c5b8cbf..2a9c05e257ad9c2f3610e9cf7a2350dbf12a22e0 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 31bea924579831fb9aa82c93c4ebe98225313416..bdfa2f951b9bac2cc0b6e1f47a087cb61101978b 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 aad857376da72291b81c3c14a507214783e679f6..1fd0594d154390f183126aee778a7ed681318443 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 383952134066bb785b99a8aa0087de363efd61e9..d6c2211f255e6a250e7fb5ba4d6a9803dcd90fd4 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 4b07fd96c33da9bdebef974cd48a15543bace37f..8819742c8ebdad16133712d73a37c8fc95c6aaa3 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 a83d70cac9aa9af53e9dd1451b3bc229808abd12..500a0e01adb35b6d90d8655b6295e66dcc6b9c5a 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>