From 6cf1f10912f152c2613f5df1188062b7eb8ee60a Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Wed, 6 Dec 2017 11:47:05 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_15_0/CDT-AE-v2_15_0.xsd b/v2_15_0/CDT-AE-v2_15_0.xsd
index bf4fe3b..a70a297 100644
--- a/v2_15_0/CDT-AE-v2_15_0.xsd
+++ b/v2_15_0/CDT-AE-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_15_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-CSEBase-v2_15_0.xsd b/v2_15_0/CDT-CSEBase-v2_15_0.xsd
index 1fc99a8..ae8f2f4 100644
--- a/v2_15_0/CDT-CSEBase-v2_15_0.xsd
+++ b/v2_15_0/CDT-CSEBase-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_14_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v2_14_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_15_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v2_15_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v2_15_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-accessControlPolicy-v2_15_0.xsd b/v2_15_0/CDT-accessControlPolicy-v2_15_0.xsd
index c938bd7..f5ed44c 100644
--- a/v2_15_0/CDT-accessControlPolicy-v2_15_0.xsd
+++ b/v2_15_0/CDT-accessControlPolicy-v2_15_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_14_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-activeCmdhPolicy-v2_15_0.xsd b/v2_15_0/CDT-activeCmdhPolicy-v2_15_0.xsd
index 6332a58..e029d17 100644
--- a/v2_15_0/CDT-activeCmdhPolicy-v2_15_0.xsd
+++ b/v2_15_0/CDT-activeCmdhPolicy-v2_15_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_14_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_15_0/CDT-allJoynApp-v2_15_0.xsd b/v2_15_0/CDT-allJoynApp-v2_15_0.xsd
index 6c848ad..e3ffdc7 100644
--- a/v2_15_0/CDT-allJoynApp-v2_15_0.xsd
+++ b/v2_15_0/CDT-allJoynApp-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v2_15_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-allJoynInterface-v2_15_0.xsd b/v2_15_0/CDT-allJoynInterface-v2_15_0.xsd
index b47d7a9..5fcde68 100644
--- a/v2_15_0/CDT-allJoynInterface-v2_15_0.xsd
+++ b/v2_15_0/CDT-allJoynInterface-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_15_0/CDT-allJoynMethod-v2_15_0.xsd b/v2_15_0/CDT-allJoynMethod-v2_15_0.xsd
index 2438524..c00069e 100644
--- a/v2_15_0/CDT-allJoynMethod-v2_15_0.xsd
+++ b/v2_15_0/CDT-allJoynMethod-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v2_15_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_15_0/CDT-allJoynMethodCall-v2_15_0.xsd b/v2_15_0/CDT-allJoynMethodCall-v2_15_0.xsd
index f57a5ef..3870c4b 100644
--- a/v2_15_0/CDT-allJoynMethodCall-v2_15_0.xsd
+++ b/v2_15_0/CDT-allJoynMethodCall-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-allJoynProperty-v2_15_0.xsd b/v2_15_0/CDT-allJoynProperty-v2_15_0.xsd
index 34805b4..c1bdcd5 100644
--- a/v2_15_0/CDT-allJoynProperty-v2_15_0.xsd
+++ b/v2_15_0/CDT-allJoynProperty-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-allJoynSvcObject-v2_15_0.xsd b/v2_15_0/CDT-allJoynSvcObject-v2_15_0.xsd
index 40f985a..ba1e3c7 100644
--- a/v2_15_0/CDT-allJoynSvcObject-v2_15_0.xsd
+++ b/v2_15_0/CDT-allJoynSvcObject-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v2_15_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-areaNwkDeviceInfo-v2_15_0.xsd b/v2_15_0/CDT-areaNwkDeviceInfo-v2_15_0.xsd
index ab698f6..ff695fa 100644
--- a/v2_15_0/CDT-areaNwkDeviceInfo-v2_15_0.xsd
+++ b/v2_15_0/CDT-areaNwkDeviceInfo-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-areaNwkInfo-v2_15_0.xsd b/v2_15_0/CDT-areaNwkInfo-v2_15_0.xsd
index bf185a5..fceb369 100644
--- a/v2_15_0/CDT-areaNwkInfo-v2_15_0.xsd
+++ b/v2_15_0/CDT-areaNwkInfo-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-battery-v2_15_0.xsd b/v2_15_0/CDT-battery-v2_15_0.xsd
index 92b0105..a1c2875 100644
--- a/v2_15_0/CDT-battery-v2_15_0.xsd
+++ b/v2_15_0/CDT-battery-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-cmdhBuffer-v2_15_0.xsd b/v2_15_0/CDT-cmdhBuffer-v2_15_0.xsd
index c2d551e..20c5aaa 100644
--- a/v2_15_0/CDT-cmdhBuffer-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhBuffer-v2_15_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_14_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_15_0/CDT-cmdhDefEcValue-v2_15_0.xsd b/v2_15_0/CDT-cmdhDefEcValue-v2_15_0.xsd
index 77146c5..503ef4a 100644
--- a/v2_15_0/CDT-cmdhDefEcValue-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhDefEcValue-v2_15_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_14_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_15_0/CDT-cmdhDefaults-v2_15_0.xsd b/v2_15_0/CDT-cmdhDefaults-v2_15_0.xsd
index 5d816a4..b98a61e 100644
--- a/v2_15_0/CDT-cmdhDefaults-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhDefaults-v2_15_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_14_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_15_0/CDT-cmdhEcDefParamValues-v2_15_0.xsd b/v2_15_0/CDT-cmdhEcDefParamValues-v2_15_0.xsd
index 0a8fe61..524c7e5 100644
--- a/v2_15_0/CDT-cmdhEcDefParamValues-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhEcDefParamValues-v2_15_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_14_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v2_15_0/CDT-cmdhLimits-v2_15_0.xsd b/v2_15_0/CDT-cmdhLimits-v2_15_0.xsd
index 7c44645..2146ec7 100644
--- a/v2_15_0/CDT-cmdhLimits-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhLimits-v2_15_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_14_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_15_0/CDT-cmdhNetworkAccessRules-v2_15_0.xsd b/v2_15_0/CDT-cmdhNetworkAccessRules-v2_15_0.xsd
index 13589ed..71524ac 100644
--- a/v2_15_0/CDT-cmdhNetworkAccessRules-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhNetworkAccessRules-v2_15_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_14_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_15_0/CDT-cmdhNwAccessRule-v2_15_0.xsd b/v2_15_0/CDT-cmdhNwAccessRule-v2_15_0.xsd
index e398779..137fcc3 100644
--- a/v2_15_0/CDT-cmdhNwAccessRule-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhNwAccessRule-v2_15_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_14_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v2_15_0/CDT-cmdhPolicy-v2_15_0.xsd b/v2_15_0/CDT-cmdhPolicy-v2_15_0.xsd
index 79a2078..99f81a2 100644
--- a/v2_15_0/CDT-cmdhPolicy-v2_15_0.xsd
+++ b/v2_15_0/CDT-cmdhPolicy-v2_15_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_14_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v2_15_0/CDT-commonTypes-v2_15_0.xsd b/v2_15_0/CDT-commonTypes-v2_15_0.xsd
index 6599bff..527ac4e 100644
--- a/v2_15_0/CDT-commonTypes-v2_15_0.xsd
+++ b/v2_15_0/CDT-commonTypes-v2_15_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_14_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_15_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_15_0/CDT-container-v2_15_0.xsd b/v2_15_0/CDT-container-v2_15_0.xsd
index 1da505c..3b654a0 100644
--- a/v2_15_0/CDT-container-v2_15_0.xsd
+++ b/v2_15_0/CDT-container-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_15_0/CDT-contentInstance-v2_15_0.xsd b/v2_15_0/CDT-contentInstance-v2_15_0.xsd
index 94ac2a3..0b7c1d1 100644
--- a/v2_15_0/CDT-contentInstance-v2_15_0.xsd
+++ b/v2_15_0/CDT-contentInstance-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-delivery-v2_15_0.xsd b/v2_15_0/CDT-delivery-v2_15_0.xsd
index 4d5b099..bf2401e 100644
--- a/v2_15_0/CDT-delivery-v2_15_0.xsd
+++ b/v2_15_0/CDT-delivery-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_15_0/CDT-deviceCapability-v2_15_0.xsd b/v2_15_0/CDT-deviceCapability-v2_15_0.xsd
index 98546fb..7d51a08 100644
--- a/v2_15_0/CDT-deviceCapability-v2_15_0.xsd
+++ b/v2_15_0/CDT-deviceCapability-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-deviceInfo-v2_15_0.xsd b/v2_15_0/CDT-deviceInfo-v2_15_0.xsd
index de3e9de..0f11a16 100644
--- a/v2_15_0/CDT-deviceInfo-v2_15_0.xsd
+++ b/v2_15_0/CDT-deviceInfo-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-dynamicAuthorizationConsultation-v2_15_0.xsd b/v2_15_0/CDT-dynamicAuthorizationConsultation-v2_15_0.xsd
index a09c714..afca605 100644
--- a/v2_15_0/CDT-dynamicAuthorizationConsultation-v2_15_0.xsd
+++ b/v2_15_0/CDT-dynamicAuthorizationConsultation-v2_15_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_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-eventConfig-v2_15_0.xsd b/v2_15_0/CDT-eventConfig-v2_15_0.xsd
index 5eb484a..126234e 100644
--- a/v2_15_0/CDT-eventConfig-v2_15_0.xsd
+++ b/v2_15_0/CDT-eventConfig-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-eventLog-v2_15_0.xsd b/v2_15_0/CDT-eventLog-v2_15_0.xsd
index a5a088c..c40e465 100644
--- a/v2_15_0/CDT-eventLog-v2_15_0.xsd
+++ b/v2_15_0/CDT-eventLog-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-execInstance-v2_15_0.xsd b/v2_15_0/CDT-execInstance-v2_15_0.xsd
index 3aba162..b705400 100644
--- a/v2_15_0/CDT-execInstance-v2_15_0.xsd
+++ b/v2_15_0/CDT-execInstance-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-firmware-v2_15_0.xsd b/v2_15_0/CDT-firmware-v2_15_0.xsd
index f52a657..b8d5e4f 100644
--- a/v2_15_0/CDT-firmware-v2_15_0.xsd
+++ b/v2_15_0/CDT-firmware-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-genericInterworkingOperationInstance-v2_15_0.xsd b/v2_15_0/CDT-genericInterworkingOperationInstance-v2_15_0.xsd
index 0317a0d..a0dcdec 100644
--- a/v2_15_0/CDT-genericInterworkingOperationInstance-v2_15_0.xsd
+++ b/v2_15_0/CDT-genericInterworkingOperationInstance-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-genericInterworkingService-v2_15_0.xsd b/v2_15_0/CDT-genericInterworkingService-v2_15_0.xsd
index 3925567..af0be10 100644
--- a/v2_15_0/CDT-genericInterworkingService-v2_15_0.xsd
+++ b/v2_15_0/CDT-genericInterworkingService-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_15_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-group-v2_15_0.xsd b/v2_15_0/CDT-group-v2_15_0.xsd
index 8c3c533..6605284 100644
--- a/v2_15_0/CDT-group-v2_15_0.xsd
+++ b/v2_15_0/CDT-group-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-locationPolicy-v2_15_0.xsd b/v2_15_0/CDT-locationPolicy-v2_15_0.xsd
index 77f7dc3..9ce06da 100644
--- a/v2_15_0/CDT-locationPolicy-v2_15_0.xsd
+++ b/v2_15_0/CDT-locationPolicy-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd b/v2_15_0/CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd
index f84bf5a..7deab48 100644
--- a/v2_15_0/CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd
+++ b/v2_15_0/CDT-m2mServiceSubscriptionProfile-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_15_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-memory-v2_15_0.xsd b/v2_15_0/CDT-memory-v2_15_0.xsd
index d8cafc1..3cbdded 100644
--- a/v2_15_0/CDT-memory-v2_15_0.xsd
+++ b/v2_15_0/CDT-memory-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-mgmtCmd-v2_15_0.xsd b/v2_15_0/CDT-mgmtCmd-v2_15_0.xsd
index e6b777c..376790c 100644
--- a/v2_15_0/CDT-mgmtCmd-v2_15_0.xsd
+++ b/v2_15_0/CDT-mgmtCmd-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_15_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-node-v2_15_0.xsd b/v2_15_0/CDT-node-v2_15_0.xsd
index e9e8ec3..f2bff82 100644
--- a/v2_15_0/CDT-node-v2_15_0.xsd
+++ b/v2_15_0/CDT-node-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v2_15_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-notification-v2_15_0.xsd b/v2_15_0/CDT-notification-v2_15_0.xsd
index 38ac3ec..a84d16b 100644
--- a/v2_15_0/CDT-notification-v2_15_0.xsd
+++ b/v2_15_0/CDT-notification-v2_15_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_14_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_14_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_15_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_15_0/CDT-notificationTargetMgmtPolicyRef-v2_15_0.xsd b/v2_15_0/CDT-notificationTargetMgmtPolicyRef-v2_15_0.xsd
index af99b8f..252c7d5 100644
--- a/v2_15_0/CDT-notificationTargetMgmtPolicyRef-v2_15_0.xsd
+++ b/v2_15_0/CDT-notificationTargetMgmtPolicyRef-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-notificationTargetPolicy-v2_15_0.xsd b/v2_15_0/CDT-notificationTargetPolicy-v2_15_0.xsd
index 9fd52c0..9b1ca6d 100644
--- a/v2_15_0/CDT-notificationTargetPolicy-v2_15_0.xsd
+++ b/v2_15_0/CDT-notificationTargetPolicy-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-policyDeletionRules-v2_15_0.xsd b/v2_15_0/CDT-policyDeletionRules-v2_15_0.xsd
index cbed30f..b54f2ff 100644
--- a/v2_15_0/CDT-policyDeletionRules-v2_15_0.xsd
+++ b/v2_15_0/CDT-policyDeletionRules-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-pollingChannel-v2_15_0.xsd b/v2_15_0/CDT-pollingChannel-v2_15_0.xsd
index eb929d9..e2ed9be 100644
--- a/v2_15_0/CDT-pollingChannel-v2_15_0.xsd
+++ b/v2_15_0/CDT-pollingChannel-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-reboot-v2_15_0.xsd b/v2_15_0/CDT-reboot-v2_15_0.xsd
index 889bf05..4eb7cb4 100644
--- a/v2_15_0/CDT-reboot-v2_15_0.xsd
+++ b/v2_15_0/CDT-reboot-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-remoteCSE-v2_15_0.xsd b/v2_15_0/CDT-remoteCSE-v2_15_0.xsd
index 2c02092..2a970d5 100644
--- a/v2_15_0/CDT-remoteCSE-v2_15_0.xsd
+++ b/v2_15_0/CDT-remoteCSE-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-request-v2_15_0.xsd b/v2_15_0/CDT-request-v2_15_0.xsd
index 2b22378..d2d5fa1 100644
--- a/v2_15_0/CDT-request-v2_15_0.xsd
+++ b/v2_15_0/CDT-request-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-requestPrimitive-v2_15_0.xsd b/v2_15_0/CDT-requestPrimitive-v2_15_0.xsd
index b4b16b9..dce50ff 100644
--- a/v2_15_0/CDT-requestPrimitive-v2_15_0.xsd
+++ b/v2_15_0/CDT-requestPrimitive-v2_15_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_14_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_15_0/CDT-responsePrimitive-v2_15_0.xsd b/v2_15_0/CDT-responsePrimitive-v2_15_0.xsd
index defe865..a159eb5 100644
--- a/v2_15_0/CDT-responsePrimitive-v2_15_0.xsd
+++ b/v2_15_0/CDT-responsePrimitive-v2_15_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_14_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v2_14_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v2_14_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v2_15_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v2_15_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_15_0/CDT-role-v2_15_0.xsd b/v2_15_0/CDT-role-v2_15_0.xsd
index 119e4f5..690e6ae 100644
--- a/v2_15_0/CDT-role-v2_15_0.xsd
+++ b/v2_15_0/CDT-role-v2_15_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_14_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-schedule-v2_15_0.xsd b/v2_15_0/CDT-schedule-v2_15_0.xsd
index 0110b50..611449d 100644
--- a/v2_15_0/CDT-schedule-v2_15_0.xsd
+++ b/v2_15_0/CDT-schedule-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-semanticDescriptor-v2_15_0.xsd b/v2_15_0/CDT-semanticDescriptor-v2_15_0.xsd
index 0d32af5..55f7cff 100644
--- a/v2_15_0/CDT-semanticDescriptor-v2_15_0.xsd
+++ b/v2_15_0/CDT-semanticDescriptor-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-serviceSubscribedAppRule-v2_15_0.xsd b/v2_15_0/CDT-serviceSubscribedAppRule-v2_15_0.xsd
index 160b52c..842de73 100644
--- a/v2_15_0/CDT-serviceSubscribedAppRule-v2_15_0.xsd
+++ b/v2_15_0/CDT-serviceSubscribedAppRule-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-serviceSubscribedNode-v2_15_0.xsd b/v2_15_0/CDT-serviceSubscribedNode-v2_15_0.xsd
index 7377f31..1711921 100644
--- a/v2_15_0/CDT-serviceSubscribedNode-v2_15_0.xsd
+++ b/v2_15_0/CDT-serviceSubscribedNode-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-software-v2_15_0.xsd b/v2_15_0/CDT-software-v2_15_0.xsd
index 778a828..7bf20c9 100644
--- a/v2_15_0/CDT-software-v2_15_0.xsd
+++ b/v2_15_0/CDT-software-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-statsCollect-v2_15_0.xsd b/v2_15_0/CDT-statsCollect-v2_15_0.xsd
index db0dc08..6eee2af 100644
--- a/v2_15_0/CDT-statsCollect-v2_15_0.xsd
+++ b/v2_15_0/CDT-statsCollect-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-statsConfig-v2_15_0.xsd b/v2_15_0/CDT-statsConfig-v2_15_0.xsd
index 1eed146..db0d3dc 100644
--- a/v2_15_0/CDT-statsConfig-v2_15_0.xsd
+++ b/v2_15_0/CDT-statsConfig-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-subscription-v2_15_0.xsd b/v2_15_0/CDT-subscription-v2_15_0.xsd
index f437194..e2093b0 100644
--- a/v2_15_0/CDT-subscription-v2_15_0.xsd
+++ b/v2_15_0/CDT-subscription-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_15_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-svcFwWrapper-v2_15_0.xsd b/v2_15_0/CDT-svcFwWrapper-v2_15_0.xsd
index eccf828..d5c7f05 100644
--- a/v2_15_0/CDT-svcFwWrapper-v2_15_0.xsd
+++ b/v2_15_0/CDT-svcFwWrapper-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-svcObjWrapper-v2_15_0.xsd b/v2_15_0/CDT-svcObjWrapper-v2_15_0.xsd
index e26ce9c..32d80e6 100644
--- a/v2_15_0/CDT-svcObjWrapper-v2_15_0.xsd
+++ b/v2_15_0/CDT-svcObjWrapper-v2_15_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_14_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v2_15_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-timeSeries-v2_15_0.xsd b/v2_15_0/CDT-timeSeries-v2_15_0.xsd
index e54d1f8..dbf6560 100644
--- a/v2_15_0/CDT-timeSeries-v2_15_0.xsd
+++ b/v2_15_0/CDT-timeSeries-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v2_15_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_15_0/CDT-timeSeriesInstance-v2_15_0.xsd b/v2_15_0/CDT-timeSeriesInstance-v2_15_0.xsd
index 0f5ed81..90c705d 100644
--- a/v2_15_0/CDT-timeSeriesInstance-v2_15_0.xsd
+++ b/v2_15_0/CDT-timeSeriesInstance-v2_15_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_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-token-v2_15_0.xsd b/v2_15_0/CDT-token-v2_15_0.xsd
index c9c21e4..0c7994b 100644
--- a/v2_15_0/CDT-token-v2_15_0.xsd
+++ b/v2_15_0/CDT-token-v2_15_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_14_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v2_15_0/CDT-trafficPattern-v2_15_0.xsd b/v2_15_0/CDT-trafficPattern-v2_15_0.xsd
index cc09eef..da43f41 100644
--- a/v2_15_0/CDT-trafficPattern-v2_15_0.xsd
+++ b/v2_15_0/CDT-trafficPattern-v2_15_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_14_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_14_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_14_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_15_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_15_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
-- 
GitLab