diff --git a/v2_13_0/CDT-AE-v2_13_0.xsd b/v2_13_0/CDT-AE-v2_13_0.xsd
index eafa567239eb11fbce8379e71d5fb700bba57d5a..5398dd66acfd796f007fc46b627c76497decdb38 100644
--- a/v2_13_0/CDT-AE-v2_13_0.xsd
+++ b/v2_13_0/CDT-AE-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_13_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-CSEBase-v2_13_0.xsd b/v2_13_0/CDT-CSEBase-v2_13_0.xsd
index dd32d1f2feca9377fcbf8baca15a733dc55bfcdc..967e5cfaf682be565959a00838d35621fb911729 100644
--- a/v2_13_0/CDT-CSEBase-v2_13_0.xsd
+++ b/v2_13_0/CDT-CSEBase-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_13_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_13_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_13_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-accessControlPolicy-v2_13_0.xsd b/v2_13_0/CDT-accessControlPolicy-v2_13_0.xsd
index a4b0826fcb256e1f041c7017329210e021b29e4a..b01872bc68202194da73ad17ede4fca15db7d7ea 100644
--- a/v2_13_0/CDT-accessControlPolicy-v2_13_0.xsd
+++ b/v2_13_0/CDT-accessControlPolicy-v2_13_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_12_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-activeCmdhPolicy-v2_13_0.xsd b/v2_13_0/CDT-activeCmdhPolicy-v2_13_0.xsd
index 17bb7b9eaaf73a03417cf5e88a8b4dd21ffe968e..4a138330475b627acc0db334e14085a5770c8811 100644
--- a/v2_13_0/CDT-activeCmdhPolicy-v2_13_0.xsd
+++ b/v2_13_0/CDT-activeCmdhPolicy-v2_13_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_12_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_13_0/CDT-allJoynApp-v2_13_0.xsd b/v2_13_0/CDT-allJoynApp-v2_13_0.xsd
index f7e6be6ddc45409728c8d04a2acfeb58f880909b..1ad86c3880c9f511cb3d096a64a288afa3c5f68d 100644
--- a/v2_13_0/CDT-allJoynApp-v2_13_0.xsd
+++ b/v2_13_0/CDT-allJoynApp-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_13_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-allJoynInterface-v2_13_0.xsd b/v2_13_0/CDT-allJoynInterface-v2_13_0.xsd
index dd977f5efd8b58df3d08418684fd4630bfd62bef..cf42b18eb3383ed9015385bd06adf7bc727a27a3 100644
--- a/v2_13_0/CDT-allJoynInterface-v2_13_0.xsd
+++ b/v2_13_0/CDT-allJoynInterface-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_13_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_13_0/CDT-allJoynMethod-v2_13_0.xsd b/v2_13_0/CDT-allJoynMethod-v2_13_0.xsd
index 9e80711ce5cc029d8dc2c913f51b0c72c0964df0..6ea6db54751a4b06b8b3cc771b715b6535461955 100644
--- a/v2_13_0/CDT-allJoynMethod-v2_13_0.xsd
+++ b/v2_13_0/CDT-allJoynMethod-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_13_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_13_0/CDT-allJoynMethodCall-v2_13_0.xsd b/v2_13_0/CDT-allJoynMethodCall-v2_13_0.xsd
index 697cc0fe6c1c9da9b8ff1eb29c6c26330340311c..4322abf02a599c191c78782299090dda0414b53f 100644
--- a/v2_13_0/CDT-allJoynMethodCall-v2_13_0.xsd
+++ b/v2_13_0/CDT-allJoynMethodCall-v2_13_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_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-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-allJoynProperty-v2_13_0.xsd b/v2_13_0/CDT-allJoynProperty-v2_13_0.xsd
index 52f1d5142ec58eeeae55dcba8edcf083bb34e027..4b9c4664c5f0afe288a18c11dee87bbf5d0c6a3a 100644
--- a/v2_13_0/CDT-allJoynProperty-v2_13_0.xsd
+++ b/v2_13_0/CDT-allJoynProperty-v2_13_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_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-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-allJoynSvcObject-v2_13_0.xsd b/v2_13_0/CDT-allJoynSvcObject-v2_13_0.xsd
index 960cb35813bdea53e65e675652e216bca4cd50fa..c081c4a88d12cf7245fd40bd806d1d78fab461e2 100644
--- a/v2_13_0/CDT-allJoynSvcObject-v2_13_0.xsd
+++ b/v2_13_0/CDT-allJoynSvcObject-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_13_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-areaNwkDeviceInfo-v2_13_0.xsd b/v2_13_0/CDT-areaNwkDeviceInfo-v2_13_0.xsd
index bc433a6c98a84ad910790822e2ca6a5226d2ff10..70abda954e333edce2d0f41213fcce33916a51cb 100644
--- a/v2_13_0/CDT-areaNwkDeviceInfo-v2_13_0.xsd
+++ b/v2_13_0/CDT-areaNwkDeviceInfo-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-areaNwkInfo-v2_13_0.xsd b/v2_13_0/CDT-areaNwkInfo-v2_13_0.xsd
index 94156d1f1261da3c3427878d5536146328fc8b2b..16165f36067cab276fdb525579c95f3cf9e3489a 100644
--- a/v2_13_0/CDT-areaNwkInfo-v2_13_0.xsd
+++ b/v2_13_0/CDT-areaNwkInfo-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-battery-v2_13_0.xsd b/v2_13_0/CDT-battery-v2_13_0.xsd
index 9265d9eb6fd68e3ddfd765d3024a968b199ad7f4..3bb7b0b7f5bef09fecace3a8305a45c55bd2550f 100644
--- a/v2_13_0/CDT-battery-v2_13_0.xsd
+++ b/v2_13_0/CDT-battery-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-cmdhBuffer-v2_13_0.xsd b/v2_13_0/CDT-cmdhBuffer-v2_13_0.xsd
index 5c6d7a1f4e218216212a15f345cd0601b9b34a1a..0c9a87561ee66347545e7ca989d4b5cd0a16140d 100644
--- a/v2_13_0/CDT-cmdhBuffer-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhBuffer-v2_13_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_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_13_0/CDT-cmdhDefEcValue-v2_13_0.xsd b/v2_13_0/CDT-cmdhDefEcValue-v2_13_0.xsd
index 30bb51b22f99e284ed26034e2e4697511eb33139..e774ae0429df46a865b2a5bef388d7250e27da4e 100644
--- a/v2_13_0/CDT-cmdhDefEcValue-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhDefEcValue-v2_13_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_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_13_0/CDT-cmdhDefaults-v2_13_0.xsd b/v2_13_0/CDT-cmdhDefaults-v2_13_0.xsd
index 1e7a169935bcfda9227bce17b53482c099b65838..bdedee93e7f352e678aaf0271452c5ea6a0f1cef 100644
--- a/v2_13_0/CDT-cmdhDefaults-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhDefaults-v2_13_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_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_13_0/CDT-cmdhEcDefParamValues-v2_13_0.xsd b/v2_13_0/CDT-cmdhEcDefParamValues-v2_13_0.xsd
index c872aebbb665a4562d0f0867c20217d84366f875..b455ee97764e03483f2c396311977d9e797532f8 100644
--- a/v2_13_0/CDT-cmdhEcDefParamValues-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhEcDefParamValues-v2_13_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_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_13_0/CDT-cmdhLimits-v2_13_0.xsd b/v2_13_0/CDT-cmdhLimits-v2_13_0.xsd
index d3db0d9377769b725e180829ef96d308b520465d..2e8321e54a2abde801dc46683d36e49e94afa3e9 100644
--- a/v2_13_0/CDT-cmdhLimits-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhLimits-v2_13_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_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_13_0/CDT-cmdhNetworkAccessRules-v2_13_0.xsd b/v2_13_0/CDT-cmdhNetworkAccessRules-v2_13_0.xsd
index edd245dfc5375e6ac715bfa864b58a3f9a424b9b..a061652a394838a0ab2c446e713acb20f885528b 100644
--- a/v2_13_0/CDT-cmdhNetworkAccessRules-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhNetworkAccessRules-v2_13_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_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_13_0/CDT-cmdhNwAccessRule-v2_13_0.xsd b/v2_13_0/CDT-cmdhNwAccessRule-v2_13_0.xsd
index 4f098dec0145ad7fe19d4b20841af6c703b6ae26..2cdc2da734b84e68e33d05a14f63ad1ff93b965e 100644
--- a/v2_13_0/CDT-cmdhNwAccessRule-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhNwAccessRule-v2_13_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_12_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_13_0/CDT-cmdhPolicy-v2_13_0.xsd b/v2_13_0/CDT-cmdhPolicy-v2_13_0.xsd
index d02742b1a9f6fe78fbcfd3b474b44f5c3a5cedfd..190fcfb67979477fb3c569ec6214587d445cc1e1 100644
--- a/v2_13_0/CDT-cmdhPolicy-v2_13_0.xsd
+++ b/v2_13_0/CDT-cmdhPolicy-v2_13_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_12_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_13_0/CDT-commonTypes-v2_13_0.xsd b/v2_13_0/CDT-commonTypes-v2_13_0.xsd
index 6e9004b33774d4078633a74aa931b9d80b2d2d75..7964d3ec257609a9a1f63eae892421fab8b4d8f4 100644
--- a/v2_13_0/CDT-commonTypes-v2_13_0.xsd
+++ b/v2_13_0/CDT-commonTypes-v2_13_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_12_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_13_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_13_0/CDT-container-v2_13_0.xsd b/v2_13_0/CDT-container-v2_13_0.xsd
index b91ddc4689e284df52466babad8a8b5de6b0498a..7a761e2a3754df3f70a24d200a20b560b2a04361 100644
--- a/v2_13_0/CDT-container-v2_13_0.xsd
+++ b/v2_13_0/CDT-container-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_13_0/CDT-contentInstance-v2_13_0.xsd b/v2_13_0/CDT-contentInstance-v2_13_0.xsd
index a5be82ad566b3a9395bbaf8f152ad51076165230..1ab15ed101c88a45a7c49ba7774e655bcb7a7ee2 100644
--- a/v2_13_0/CDT-contentInstance-v2_13_0.xsd
+++ b/v2_13_0/CDT-contentInstance-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-delivery-v2_13_0.xsd b/v2_13_0/CDT-delivery-v2_13_0.xsd
index 809c040d8e58676a2d04c977ac234b6c6f860e0d..6259d8f0a5a0cfbaa1f87f29a8e8c945b0c529f9 100644
--- a/v2_13_0/CDT-delivery-v2_13_0.xsd
+++ b/v2_13_0/CDT-delivery-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_13_0/CDT-deviceCapability-v2_13_0.xsd b/v2_13_0/CDT-deviceCapability-v2_13_0.xsd
index 1e3fbf5edccd5aed1185c7da8a9492316b8b9d13..9b058a4fa315378e080ee30fc894a95f09fb7471 100644
--- a/v2_13_0/CDT-deviceCapability-v2_13_0.xsd
+++ b/v2_13_0/CDT-deviceCapability-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-deviceInfo-v2_13_0.xsd b/v2_13_0/CDT-deviceInfo-v2_13_0.xsd
index 1468f5c4f01a69dde16f6bff4ad8797f5f23a858..c8c0f9ca01aea177312805bb5a100a6c2c322ceb 100644
--- a/v2_13_0/CDT-deviceInfo-v2_13_0.xsd
+++ b/v2_13_0/CDT-deviceInfo-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-dynamicAuthorizationConsultation-v2_13_0.xsd b/v2_13_0/CDT-dynamicAuthorizationConsultation-v2_13_0.xsd
index c41eb1f6846a6aff7995bcaecbc2f448ba28b85d..e6b0fbe4295d2f36ca53d7a9114fda7019cac673 100644
--- a/v2_13_0/CDT-dynamicAuthorizationConsultation-v2_13_0.xsd
+++ b/v2_13_0/CDT-dynamicAuthorizationConsultation-v2_13_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_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-eventConfig-v2_13_0.xsd b/v2_13_0/CDT-eventConfig-v2_13_0.xsd
index d2b224b8c52d6c364d934118121706825742da86..5586cf1d73897907172580b32bb6af0d427afefa 100644
--- a/v2_13_0/CDT-eventConfig-v2_13_0.xsd
+++ b/v2_13_0/CDT-eventConfig-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-eventLog-v2_13_0.xsd b/v2_13_0/CDT-eventLog-v2_13_0.xsd
index 513a21db973b03b24a0bd6fe713e1f963fa71195..48f0eb24f54b8a5dc58680f3edffcf3c95a45563 100644
--- a/v2_13_0/CDT-eventLog-v2_13_0.xsd
+++ b/v2_13_0/CDT-eventLog-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-execInstance-v2_13_0.xsd b/v2_13_0/CDT-execInstance-v2_13_0.xsd
index d1094afed1cfb78bc3715e7e2b2a293a6cd35f7c..9c49299319843803925fb69789bcae270c1b0854 100644
--- a/v2_13_0/CDT-execInstance-v2_13_0.xsd
+++ b/v2_13_0/CDT-execInstance-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-firmware-v2_13_0.xsd b/v2_13_0/CDT-firmware-v2_13_0.xsd
index f9d80dc1f6c34284d0e17125e29e630e9b23626c..600b6a04c077e75788b4e08a591df8766679d8c7 100644
--- a/v2_13_0/CDT-firmware-v2_13_0.xsd
+++ b/v2_13_0/CDT-firmware-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-genericInterworkingOperationInstance-v2_13_0.xsd b/v2_13_0/CDT-genericInterworkingOperationInstance-v2_13_0.xsd
index 1aecdd05b80ca6c8ffdda30541b5f2384d3eb4b4..50d81434baf2241850f2ffed37a7c231478b3d9a 100644
--- a/v2_13_0/CDT-genericInterworkingOperationInstance-v2_13_0.xsd
+++ b/v2_13_0/CDT-genericInterworkingOperationInstance-v2_13_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_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-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-genericInterworkingService-v2_13_0.xsd b/v2_13_0/CDT-genericInterworkingService-v2_13_0.xsd
index 93fc89ab59a44d147e7e8bdf75ed6efe32084d11..f912f5c2723ebc4228f48408bff1402f3361d606 100644
--- a/v2_13_0/CDT-genericInterworkingService-v2_13_0.xsd
+++ b/v2_13_0/CDT-genericInterworkingService-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_13_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-group-v2_13_0.xsd b/v2_13_0/CDT-group-v2_13_0.xsd
index 63699bf08775c53497d6e2116cc2983e4f60a26e..c7b9aaccf6d40eb64fec7066680f0442cdda4907 100644
--- a/v2_13_0/CDT-group-v2_13_0.xsd
+++ b/v2_13_0/CDT-group-v2_13_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_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-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-locationPolicy-v2_13_0.xsd b/v2_13_0/CDT-locationPolicy-v2_13_0.xsd
index 3291bade5f27d0685c8d5d7ce6ead5e641d06a46..6ad1809b193f401986f5ce3c54a0e1907273a9c2 100644
--- a/v2_13_0/CDT-locationPolicy-v2_13_0.xsd
+++ b/v2_13_0/CDT-locationPolicy-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-m2mServiceSubscriptionProfile-v2_13_0.xsd b/v2_13_0/CDT-m2mServiceSubscriptionProfile-v2_13_0.xsd
index fd88a9835f774ee60ff68ccbc37ffa17bc5f4ab3..23fb5a643ca6c844e8aea12dafd83235922d5dc8 100644
--- a/v2_13_0/CDT-m2mServiceSubscriptionProfile-v2_13_0.xsd
+++ b/v2_13_0/CDT-m2mServiceSubscriptionProfile-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_13_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-memory-v2_13_0.xsd b/v2_13_0/CDT-memory-v2_13_0.xsd
index 5eaa234eed01d78ee3cde22a30e6a6ab4f3464b8..e1cef5eddba2677c2e9ea838942151696d1be01c 100644
--- a/v2_13_0/CDT-memory-v2_13_0.xsd
+++ b/v2_13_0/CDT-memory-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-mgmtCmd-v2_13_0.xsd b/v2_13_0/CDT-mgmtCmd-v2_13_0.xsd
index 57de1c42678c0b5815d29d6fabc47bcd38c5abfe..806656a0b3bb84e18a0833028b9aec836c3fc6ec 100644
--- a/v2_13_0/CDT-mgmtCmd-v2_13_0.xsd
+++ b/v2_13_0/CDT-mgmtCmd-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_13_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-node-v2_13_0.xsd b/v2_13_0/CDT-node-v2_13_0.xsd
index f6499e834e043eb34dbb1d0f1e72fce58d23bdf1..c5204989cc96550d75213ef76b18f877eab154a5 100644
--- a/v2_13_0/CDT-node-v2_13_0.xsd
+++ b/v2_13_0/CDT-node-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_13_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-notification-v2_13_0.xsd b/v2_13_0/CDT-notification-v2_13_0.xsd
index d676131599b8655a7afb37e04382ab2e0b48cb43..d7f1acac772b2c52e45b06e145ad84b6b20c11d8 100644
--- a/v2_13_0/CDT-notification-v2_13_0.xsd
+++ b/v2_13_0/CDT-notification-v2_13_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_12_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_12_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_13_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_13_0/CDT-notificationTargetMgmtPolicyRef-v2_13_0.xsd b/v2_13_0/CDT-notificationTargetMgmtPolicyRef-v2_13_0.xsd
index f98fc706bf58e7d4375833e1764602500ec1de09..b851a8c15be78dcfbbac03da18f3840516e0fe2b 100644
--- a/v2_13_0/CDT-notificationTargetMgmtPolicyRef-v2_13_0.xsd
+++ b/v2_13_0/CDT-notificationTargetMgmtPolicyRef-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-notificationTargetPolicy-v2_13_0.xsd b/v2_13_0/CDT-notificationTargetPolicy-v2_13_0.xsd
index 64c73507f381f583f542a8b7f5bd45083929c70a..5e382fae0fe26291b092aa526720477a490659a8 100644
--- a/v2_13_0/CDT-notificationTargetPolicy-v2_13_0.xsd
+++ b/v2_13_0/CDT-notificationTargetPolicy-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-policyDeletionRules-v2_13_0.xsd b/v2_13_0/CDT-policyDeletionRules-v2_13_0.xsd
index e87d3ab67c1b63688136273d1df3b40cfaf31a45..42776036c950579d321d0c2fc8a4ebc31ce63c79 100644
--- a/v2_13_0/CDT-policyDeletionRules-v2_13_0.xsd
+++ b/v2_13_0/CDT-policyDeletionRules-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-pollingChannel-v2_13_0.xsd b/v2_13_0/CDT-pollingChannel-v2_13_0.xsd
index 2597ce788fd50f812249a8ff5236fe862bfc9216..a61201c31df62f8c6ff683cd245d60b7dc2370f5 100644
--- a/v2_13_0/CDT-pollingChannel-v2_13_0.xsd
+++ b/v2_13_0/CDT-pollingChannel-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-reboot-v2_13_0.xsd b/v2_13_0/CDT-reboot-v2_13_0.xsd
index fa6154c5c95b0abbace1539f6537d8421d6af7ae..a327a37372267e9b0c7af147ae6c6cae4908e34b 100644
--- a/v2_13_0/CDT-reboot-v2_13_0.xsd
+++ b/v2_13_0/CDT-reboot-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-remoteCSE-v2_13_0.xsd b/v2_13_0/CDT-remoteCSE-v2_13_0.xsd
index fc435727bd69bcd4e5f66b2af9700c25ec9c76e2..bf13f07d13a82054dd67553283e2c5572dff81e8 100644
--- a/v2_13_0/CDT-remoteCSE-v2_13_0.xsd
+++ b/v2_13_0/CDT-remoteCSE-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_13_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-request-v2_13_0.xsd b/v2_13_0/CDT-request-v2_13_0.xsd
index 2199c7dbee7b7a170c6a69eca91a5cd13ce8ebef..44a6017714a8c7888f8826f4d203c5851c9425f5 100644
--- a/v2_13_0/CDT-request-v2_13_0.xsd
+++ b/v2_13_0/CDT-request-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-requestPrimitive-v2_13_0.xsd b/v2_13_0/CDT-requestPrimitive-v2_13_0.xsd
index e6d25cb77c65dbd74f48e4175ea4404d6910b7ca..bf63201533b18d233703410bf01918c07a34190b 100644
--- a/v2_13_0/CDT-requestPrimitive-v2_13_0.xsd
+++ b/v2_13_0/CDT-requestPrimitive-v2_13_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_12_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_13_0/CDT-responsePrimitive-v2_13_0.xsd b/v2_13_0/CDT-responsePrimitive-v2_13_0.xsd
index 079c02d6000af975d3dc9a61e5a55ea449508092..02acbf925daf3703bf3c03543a55488bfeb34593 100644
--- a/v2_13_0/CDT-responsePrimitive-v2_13_0.xsd
+++ b/v2_13_0/CDT-responsePrimitive-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_13_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_13_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_13_0/CDT-role-v2_13_0.xsd b/v2_13_0/CDT-role-v2_13_0.xsd
index 164ddd0726b85f650e8c8a0e68b2471d8b3c0e7f..d495aa62eb60965453c09c7d2af027b93bcf9f2b 100644
--- a/v2_13_0/CDT-role-v2_13_0.xsd
+++ b/v2_13_0/CDT-role-v2_13_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_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-schedule-v2_13_0.xsd b/v2_13_0/CDT-schedule-v2_13_0.xsd
index a6650e8af51be6367f87f4f360e080a3cc1233c7..2718c4898b7436c36d98ddc70b135479a21d0808 100644
--- a/v2_13_0/CDT-schedule-v2_13_0.xsd
+++ b/v2_13_0/CDT-schedule-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-semanticDescriptor-v2_13_0.xsd b/v2_13_0/CDT-semanticDescriptor-v2_13_0.xsd
index 24a3c72d422257f1bd4e510d1a62734300085bf7..93c97be389fa3b4a96de5fe88ba357d47a7ad213 100644
--- a/v2_13_0/CDT-semanticDescriptor-v2_13_0.xsd
+++ b/v2_13_0/CDT-semanticDescriptor-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-serviceSubscribedAppRule-v2_13_0.xsd b/v2_13_0/CDT-serviceSubscribedAppRule-v2_13_0.xsd
index b80a2f45fd9ca808766f360f59fadd72232eabda..f645b2aa58a535db78954377ab6a0f3a651555eb 100644
--- a/v2_13_0/CDT-serviceSubscribedAppRule-v2_13_0.xsd
+++ b/v2_13_0/CDT-serviceSubscribedAppRule-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-serviceSubscribedNode-v2_13_0.xsd b/v2_13_0/CDT-serviceSubscribedNode-v2_13_0.xsd
index ecde977cb7819bd8a4ced37c9edfc95cd4acba55..ad8e1afc6bb0eba4373e593b44d00af14686af43 100644
--- a/v2_13_0/CDT-serviceSubscribedNode-v2_13_0.xsd
+++ b/v2_13_0/CDT-serviceSubscribedNode-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-software-v2_13_0.xsd b/v2_13_0/CDT-software-v2_13_0.xsd
index a7ad4e70b32d1070bfd7b2315949ed74b0bb7e57..815bfdf86ba4c36b30b9a2837992cd251344583b 100644
--- a/v2_13_0/CDT-software-v2_13_0.xsd
+++ b/v2_13_0/CDT-software-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-statsCollect-v2_13_0.xsd b/v2_13_0/CDT-statsCollect-v2_13_0.xsd
index d8b507b1b53eefd3962a143a5b295da5a1ca08f9..8a48a1d380252671f8e62e11d57355aa46c9bdcf 100644
--- a/v2_13_0/CDT-statsCollect-v2_13_0.xsd
+++ b/v2_13_0/CDT-statsCollect-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-statsConfig-v2_13_0.xsd b/v2_13_0/CDT-statsConfig-v2_13_0.xsd
index 13341e03c1ca9c281853fff499d86e76bc8b44a6..0f06a192a87aa3dd139a12682344cb5683b857da 100644
--- a/v2_13_0/CDT-statsConfig-v2_13_0.xsd
+++ b/v2_13_0/CDT-statsConfig-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-subscription-v2_13_0.xsd b/v2_13_0/CDT-subscription-v2_13_0.xsd
index 8c503b101272a2b83d426c17523599d2f0e59e82..71cb4825b9e0f832cd529ae38a23f5d78afc12af 100644
--- a/v2_13_0/CDT-subscription-v2_13_0.xsd
+++ b/v2_13_0/CDT-subscription-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_13_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-svcFwWrapper-v2_13_0.xsd b/v2_13_0/CDT-svcFwWrapper-v2_13_0.xsd
index 25adfa4eb6161f267bc44e652459e434a20c0672..d06fb2029c038ef2dc891b3ea2e8d9fdd1b9d4a6 100644
--- a/v2_13_0/CDT-svcFwWrapper-v2_13_0.xsd
+++ b/v2_13_0/CDT-svcFwWrapper-v2_13_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_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-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-svcObjWrapper-v2_13_0.xsd b/v2_13_0/CDT-svcObjWrapper-v2_13_0.xsd
index 2a9c05e257ad9c2f3610e9cf7a2350dbf12a22e0..19107f88c59eaa4da2d29bcb478bc6687ecf3b8c 100644
--- a/v2_13_0/CDT-svcObjWrapper-v2_13_0.xsd
+++ b/v2_13_0/CDT-svcObjWrapper-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_13_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-timeSeries-v2_13_0.xsd b/v2_13_0/CDT-timeSeries-v2_13_0.xsd
index bdfa2f951b9bac2cc0b6e1f47a087cb61101978b..141ae1dadbb6bbc1878a2b9b82b537f48e365e83 100644
--- a/v2_13_0/CDT-timeSeries-v2_13_0.xsd
+++ b/v2_13_0/CDT-timeSeries-v2_13_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_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:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_13_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_13_0/CDT-timeSeriesInstance-v2_13_0.xsd b/v2_13_0/CDT-timeSeriesInstance-v2_13_0.xsd
index 1fd0594d154390f183126aee778a7ed681318443..19598f1c89497435ca50123d74a4db203fdd6c7c 100644
--- a/v2_13_0/CDT-timeSeriesInstance-v2_13_0.xsd
+++ b/v2_13_0/CDT-timeSeriesInstance-v2_13_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_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-token-v2_13_0.xsd b/v2_13_0/CDT-token-v2_13_0.xsd
index d6c2211f255e6a250e7fb5ba4d6a9803dcd90fd4..2918a782c6be65a7802fe3336405fd8fd16d1a16 100644
--- a/v2_13_0/CDT-token-v2_13_0.xsd
+++ b/v2_13_0/CDT-token-v2_13_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_12_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_13_0/CDT-trafficPattern-v2_13_0.xsd b/v2_13_0/CDT-trafficPattern-v2_13_0.xsd
index 8819742c8ebdad16133712d73a37c8fc95c6aaa3..6fb13182d95093cb1397f78ae4fa175a0b609e88 100644
--- a/v2_13_0/CDT-trafficPattern-v2_13_0.xsd
+++ b/v2_13_0/CDT-trafficPattern-v2_13_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_12_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_12_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_12_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_13_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_13_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>