diff --git a/v3_23_0/CDT-AE-v3_23_0.xsd b/v3_23_0/CDT-AE-v3_23_0.xsd
index 371fb53af9d5074804669c5959b095a89fd3b137..1f58646295c6a373d1290e5f34b448fe63dbcf64 100644
--- a/v3_23_0/CDT-AE-v3_23_0.xsd
+++ b/v3_23_0/CDT-AE-v3_23_0.xsd
@@ -26,20 +26,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-multimediaSession-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-triggerRequest-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-AEContactList-v3_23_0.xsd b/v3_23_0/CDT-AEContactList-v3_23_0.xsd
index 1f09590789cae9b9612ee60f0d30b4bcc829bfdb..79239611af559e87e1ea21a3dbc35e1f73e6e717 100644
--- a/v3_23_0/CDT-AEContactList-v3_23_0.xsd
+++ b/v3_23_0/CDT-AEContactList-v3_23_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-AEContactListPerCSE-v3_23_0.xsd b/v3_23_0/CDT-AEContactListPerCSE-v3_23_0.xsd
index 7c20786dbb91f85c13b65246e7eb45e6a505adbf..3ce933a07eb6eb6858ec2669df3d4c9209e00438 100644
--- a/v3_23_0/CDT-AEContactListPerCSE-v3_23_0.xsd
+++ b/v3_23_0/CDT-AEContactListPerCSE-v3_23_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-CSEBase-v3_23_0.xsd b/v3_23_0/CDT-CSEBase-v3_23_0.xsd
index 0a0036272a0f3c9c081729fba03b375e433e2817..d597ce72b252c2264d83dc7ceba01bd76143d5bc 100644
--- a/v3_23_0/CDT-CSEBase-v3_23_0.xsd
+++ b/v3_23_0/CDT-CSEBase-v3_23_0.xsd
@@ -26,38 +26,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_22_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_22_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_22_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_23_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationDecision-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationPolicy-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-authorizationInformation-v3_23_0.xsd" />   
+    <xs:include schemaLocation="CDT-ontologyRepository-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-AEContactList-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-localMulticastGroup-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-transactionMgmt-v3_23_0.xsd" />
+    <xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-accessControlPolicy-v3_23_0.xsd b/v3_23_0/CDT-accessControlPolicy-v3_23_0.xsd
index 0fed8ea2f772a104ec054a63ba64cbc41d2e2b32..d62c5af9badad66f4ec8d51b2cf4ee8f29703b35 100644
--- a/v3_23_0/CDT-accessControlPolicy-v3_23_0.xsd
+++ b/v3_23_0/CDT-accessControlPolicy-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-activeCmdhPolicy-v3_23_0.xsd b/v3_23_0/CDT-activeCmdhPolicy-v3_23_0.xsd
index 1b4c251e0e27d543f3c877dfd2cfae7ea7afdd1c..44eaf003f7d7156aa9e1bc7b751057018a9f75ad 100644
--- a/v3_23_0/CDT-activeCmdhPolicy-v3_23_0.xsd
+++ b/v3_23_0/CDT-activeCmdhPolicy-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_23_0/CDT-allJoynApp-v3_23_0.xsd b/v3_23_0/CDT-allJoynApp-v3_23_0.xsd
index 9994cd48c9b840fc6304f5007a72dfd3a696c58c..62c4097bf7008768ed2f81d733faf2d2ac076435 100644
--- a/v3_23_0/CDT-allJoynApp-v3_23_0.xsd
+++ b/v3_23_0/CDT-allJoynApp-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_23_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-allJoynInterface-v3_23_0.xsd b/v3_23_0/CDT-allJoynInterface-v3_23_0.xsd
index 757bc1f0f707e4141bedc9eb99fea6618ee95fc5..0c1fd4f80edc6821405b9fb37a4411334106d87c 100644
--- a/v3_23_0/CDT-allJoynInterface-v3_23_0.xsd
+++ b/v3_23_0/CDT-allJoynInterface-v3_23_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_23_0/CDT-allJoynMethod-v3_23_0.xsd b/v3_23_0/CDT-allJoynMethod-v3_23_0.xsd
index 2ac5ca788619415cffd08d17d67f0085266ef699..4f05fb1d16d4a1c34b6f0cc2d5d99ef17c93978d 100644
--- a/v3_23_0/CDT-allJoynMethod-v3_23_0.xsd
+++ b/v3_23_0/CDT-allJoynMethod-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_23_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_23_0/CDT-allJoynMethodCall-v3_23_0.xsd b/v3_23_0/CDT-allJoynMethodCall-v3_23_0.xsd
index 0dd528fd30351257f5d0ba328ae7f584febace3e..050a4f614c471d67a7a6198658189de539088b19 100644
--- a/v3_23_0/CDT-allJoynMethodCall-v3_23_0.xsd
+++ b/v3_23_0/CDT-allJoynMethodCall-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-allJoynProperty-v3_23_0.xsd b/v3_23_0/CDT-allJoynProperty-v3_23_0.xsd
index 71928ab15a66354b70db49dee92333cdc7f8abc8..40db54c1d9e928187e3d8e42395be28bc707d0c6 100644
--- a/v3_23_0/CDT-allJoynProperty-v3_23_0.xsd
+++ b/v3_23_0/CDT-allJoynProperty-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-allJoynSvcObject-v3_23_0.xsd b/v3_23_0/CDT-allJoynSvcObject-v3_23_0.xsd
index 268536e07d17ba94170a7d87d740cd75bfabec7e..c34fe67906b6489cb486bae422bfea4a844409e4 100644
--- a/v3_23_0/CDT-allJoynSvcObject-v3_23_0.xsd
+++ b/v3_23_0/CDT-allJoynSvcObject-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_23_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-areaNwkDeviceInfo-v3_23_0.xsd b/v3_23_0/CDT-areaNwkDeviceInfo-v3_23_0.xsd
index bc68712684c5ffd6cc01f9c49929090141714691..b28a578f64cb501a72e38bc59a6a8a0577618ab4 100644
--- a/v3_23_0/CDT-areaNwkDeviceInfo-v3_23_0.xsd
+++ b/v3_23_0/CDT-areaNwkDeviceInfo-v3_23_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-areaNwkInfo-v3_23_0.xsd b/v3_23_0/CDT-areaNwkInfo-v3_23_0.xsd
index 4bafbef49e1dfa2034e13a1c6031b6a4a98d994a..5d01b78f844c67ec2699fc3cf1a4141a76145f42 100644
--- a/v3_23_0/CDT-areaNwkInfo-v3_23_0.xsd
+++ b/v3_23_0/CDT-areaNwkInfo-v3_23_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-authorizationDecision-v3_23_0.xsd b/v3_23_0/CDT-authorizationDecision-v3_23_0.xsd
index 827cd299f573bfac8d8fb808a641ab761f66c52f..763c5d3e384ba082ec71044bae9d5b67631862c9 100644
--- a/v3_23_0/CDT-authorizationDecision-v3_23_0.xsd
+++ b/v3_23_0/CDT-authorizationDecision-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-authorizationInformation-v3_23_0.xsd b/v3_23_0/CDT-authorizationInformation-v3_23_0.xsd
index f103f34f6587bcb822a264e04f1fa6c66b9743a4..f69f17ab87417062b029a715d0f939a78064859b 100644
--- a/v3_23_0/CDT-authorizationInformation-v3_23_0.xsd
+++ b/v3_23_0/CDT-authorizationInformation-v3_23_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-role-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-token-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-authorizationPolicy-v3_23_0.xsd b/v3_23_0/CDT-authorizationPolicy-v3_23_0.xsd
index 950152c6182673e9f5c66ac6011778c5f7f67cb3..6e1db364d8a52332473f5c08f8e57a8ae6ad499c 100644
--- a/v3_23_0/CDT-authorizationPolicy-v3_23_0.xsd
+++ b/v3_23_0/CDT-authorizationPolicy-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-backgroundDataTransfer-v3_23_0.xsd b/v3_23_0/CDT-backgroundDataTransfer-v3_23_0.xsd
index 2663845ad8a92952a427c4519eb86c4fc98c231c..9b11c1805e89890e69639cbe13a5e735894a9618 100644
--- a/v3_23_0/CDT-backgroundDataTransfer-v3_23_0.xsd
+++ b/v3_23_0/CDT-backgroundDataTransfer-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-battery-v3_23_0.xsd b/v3_23_0/CDT-battery-v3_23_0.xsd
index 25d1c8e3d3baaa9a62554cbb8b80114dc66c0902..1dafe51dda2c3e424f3440b275c1dba2abd7910b 100644
--- a/v3_23_0/CDT-battery-v3_23_0.xsd
+++ b/v3_23_0/CDT-battery-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-cmdhBuffer-v3_23_0.xsd b/v3_23_0/CDT-cmdhBuffer-v3_23_0.xsd
index a0c7457cff2f5b74f55a5a2ce823f27697a8927c..db6637b95720f52922b9c12889e69c6087df63b3 100644
--- a/v3_23_0/CDT-cmdhBuffer-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhBuffer-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_23_0/CDT-cmdhDefEcValue-v3_23_0.xsd b/v3_23_0/CDT-cmdhDefEcValue-v3_23_0.xsd
index f87cdff5a78b3a2704a30d7b1aa48d6080fa5da1..a81164135194a0f67e551ada1f22452f165ea575 100644
--- a/v3_23_0/CDT-cmdhDefEcValue-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhDefEcValue-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_23_0/CDT-cmdhDefaults-v3_23_0.xsd b/v3_23_0/CDT-cmdhDefaults-v3_23_0.xsd
index 5c9a226208fed211cfe12fc34376f46abefafdea..4519340552e41dfdea2ce77dafc7edde6f1bdac1 100644
--- a/v3_23_0/CDT-cmdhDefaults-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhDefaults-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_23_0/CDT-cmdhEcDefParamValues-v3_23_0.xsd b/v3_23_0/CDT-cmdhEcDefParamValues-v3_23_0.xsd
index e96bf2c63f25dfc6f05c5ae0109bbcb344d3ba30..85f60ecc2543c18156f096741affc9b6bc0aeb47 100644
--- a/v3_23_0/CDT-cmdhEcDefParamValues-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhEcDefParamValues-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_23_0/CDT-cmdhLimits-v3_23_0.xsd b/v3_23_0/CDT-cmdhLimits-v3_23_0.xsd
index 00f4dca429017c6b0e297e45f29428c765e05ceb..e080ad74cd28db775002db981f9884ace8ad3335 100644
--- a/v3_23_0/CDT-cmdhLimits-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhLimits-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_23_0/CDT-cmdhNetworkAccessRules-v3_23_0.xsd b/v3_23_0/CDT-cmdhNetworkAccessRules-v3_23_0.xsd
index 2cf722d3b318abda8e8750621c913ca0f0a57eed..5c386241c438bb7faa124ca27c6864a34fafce44 100644
--- a/v3_23_0/CDT-cmdhNetworkAccessRules-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhNetworkAccessRules-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_23_0/CDT-cmdhNwAccessRule-v3_23_0.xsd b/v3_23_0/CDT-cmdhNwAccessRule-v3_23_0.xsd
index db23f74169aa84b9fad35219ab982839e5f32254..a15c9b0d53e0a2739bcc94c965cdccb05b6ea55c 100644
--- a/v3_23_0/CDT-cmdhNwAccessRule-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhNwAccessRule-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_23_0/CDT-cmdhPolicy-v3_23_0.xsd b/v3_23_0/CDT-cmdhPolicy-v3_23_0.xsd
index ac884a0f48ed23c66d024432227fbbe87df8a158..83deff4fa0058ee7ef7e851004a4df14f56d52b7 100644
--- a/v3_23_0/CDT-cmdhPolicy-v3_23_0.xsd
+++ b/v3_23_0/CDT-cmdhPolicy-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_23_0/CDT-commonTypes-v3_23_0.xsd b/v3_23_0/CDT-commonTypes-v3_23_0.xsd
index e47485ada5d7854e5c10695b1cf7b9d4335f26de..ca6accb53a5a6481104ad0a8082e15a9f90fe388 100644
--- a/v3_23_0/CDT-commonTypes-v3_23_0.xsd
+++ b/v3_23_0/CDT-commonTypes-v3_23_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_23_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_23_0/CDT-container-v3_23_0.xsd b/v3_23_0/CDT-container-v3_23_0.xsd
index 49ae83d894e1e2979f4cd7c2c871b1e55c41b315..a1c933f80664111329b18278d0f8b0b0932d5236 100644
--- a/v3_23_0/CDT-container-v3_23_0.xsd
+++ b/v3_23_0/CDT-container-v3_23_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_23_0/CDT-contentInstance-v3_23_0.xsd b/v3_23_0/CDT-contentInstance-v3_23_0.xsd
index 54bcb8caf9d23594d2255f890759d368c821fb1f..9cd3d9d78ce59527a3e694b20835a7eb14b89b82 100644
--- a/v3_23_0/CDT-contentInstance-v3_23_0.xsd
+++ b/v3_23_0/CDT-contentInstance-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-crossResourceSubscription-v3_23_0.xsd b/v3_23_0/CDT-crossResourceSubscription-v3_23_0.xsd
index 4e8f37fe06d8cb044c5675d42b41bbcf1b101f32..7d22dbb34a3152af582a325494f5ad967a72038c 100644
--- a/v3_23_0/CDT-crossResourceSubscription-v3_23_0.xsd
+++ b/v3_23_0/CDT-crossResourceSubscription-v3_23_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-delivery-v3_23_0.xsd b/v3_23_0/CDT-delivery-v3_23_0.xsd
index f5d25aab1d9d08fd907a9542c6dc1cc87c5480ee..ac88738d1412dde7f38456e92462294e45c13f02 100644
--- a/v3_23_0/CDT-delivery-v3_23_0.xsd
+++ b/v3_23_0/CDT-delivery-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_23_0/CDT-deviceCapability-v3_23_0.xsd b/v3_23_0/CDT-deviceCapability-v3_23_0.xsd
index 6b404fd6255bd8c65b5b0c1df4a50b02a0b68ce9..f10c03c8ee6629a2a40ce7fb3fed57b81243c612 100644
--- a/v3_23_0/CDT-deviceCapability-v3_23_0.xsd
+++ b/v3_23_0/CDT-deviceCapability-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-deviceInfo-v3_23_0.xsd b/v3_23_0/CDT-deviceInfo-v3_23_0.xsd
index 69260e9f27173004cb71f23ce71414cd6d60d79b..7546aa87fa062c837c674153cd48f6485f1c096e 100644
--- a/v3_23_0/CDT-deviceInfo-v3_23_0.xsd
+++ b/v3_23_0/CDT-deviceInfo-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-dynamicAuthorizationConsultation-v3_23_0.xsd b/v3_23_0/CDT-dynamicAuthorizationConsultation-v3_23_0.xsd
index 3bb9b270022da8f87034687cebd52f329d1f6a86..43ac0d77fb65d4ad950859516d973679d150b0f9 100644
--- a/v3_23_0/CDT-dynamicAuthorizationConsultation-v3_23_0.xsd
+++ b/v3_23_0/CDT-dynamicAuthorizationConsultation-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-eventConfig-v3_23_0.xsd b/v3_23_0/CDT-eventConfig-v3_23_0.xsd
index 21b8f2b1c02756787799c6de996d3298f22a6c07..a6fdb49ea5354ff17f2b7ea38e991a52fddc7bad 100644
--- a/v3_23_0/CDT-eventConfig-v3_23_0.xsd
+++ b/v3_23_0/CDT-eventConfig-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-eventLog-v3_23_0.xsd b/v3_23_0/CDT-eventLog-v3_23_0.xsd
index a87c6d0bac055696a65d8ac277d1785f2ef86e0b..d7f9f8abc07d20d9832db148320e62184df4188b 100644
--- a/v3_23_0/CDT-eventLog-v3_23_0.xsd
+++ b/v3_23_0/CDT-eventLog-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-execInstance-v3_23_0.xsd b/v3_23_0/CDT-execInstance-v3_23_0.xsd
index aed0b6ed286c2c5f3eb361baef768ef7e644206e..5247284696c5953597564663832d4c05bcbea982 100644
--- a/v3_23_0/CDT-execInstance-v3_23_0.xsd
+++ b/v3_23_0/CDT-execInstance-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-firmware-v3_23_0.xsd b/v3_23_0/CDT-firmware-v3_23_0.xsd
index 2162b1f81d988a62623dec1f10834875092edb6a..efb4616ff2e6b69939ebbb0d1afe350eb3e7dd55 100644
--- a/v3_23_0/CDT-firmware-v3_23_0.xsd
+++ b/v3_23_0/CDT-firmware-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-genericInterworkingOperationInstance-v3_23_0.xsd b/v3_23_0/CDT-genericInterworkingOperationInstance-v3_23_0.xsd
index 9d620106292649dfcdd15ed5a758d349866006cc..b7dd53cf1c792c8ef548b2c7f0f8095f55a1c778 100644
--- a/v3_23_0/CDT-genericInterworkingOperationInstance-v3_23_0.xsd
+++ b/v3_23_0/CDT-genericInterworkingOperationInstance-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-genericInterworkingService-v3_23_0.xsd b/v3_23_0/CDT-genericInterworkingService-v3_23_0.xsd
index 6d65bb13b27abbcaa843cadf12a27d5d315a8813..8e1e6aab90b313ed97fad967af5520bf82c12909 100644
--- a/v3_23_0/CDT-genericInterworkingService-v3_23_0.xsd
+++ b/v3_23_0/CDT-genericInterworkingService-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_23_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-group-v3_23_0.xsd b/v3_23_0/CDT-group-v3_23_0.xsd
index a12f2916f07c18cfdf8d227a1b265ac831a3b9d6..7cc79647753308bdc7958710c3461010b3398b04 100644
--- a/v3_23_0/CDT-group-v3_23_0.xsd
+++ b/v3_23_0/CDT-group-v3_23_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_23_0/CDT-localMulticastGroup-v3_23_0.xsd b/v3_23_0/CDT-localMulticastGroup-v3_23_0.xsd
index 7d8e663757e745a5106592e053dc0f947e024af5..7404150e2397959bcaf3236d62a947df18fde564 100644
--- a/v3_23_0/CDT-localMulticastGroup-v3_23_0.xsd
+++ b/v3_23_0/CDT-localMulticastGroup-v3_23_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_22_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_23_0/CDT-locationPolicy-v3_23_0.xsd b/v3_23_0/CDT-locationPolicy-v3_23_0.xsd
index fdf48756a1c38eca13d596a193e01f886c52e178..1570ad7dc3b6ad015c92dabc845e7c46e4e93935 100644
--- a/v3_23_0/CDT-locationPolicy-v3_23_0.xsd
+++ b/v3_23_0/CDT-locationPolicy-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd b/v3_23_0/CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd
index 30f5a8a6d8352925cbc62ebea25d5a601ca6fa37..cd1429b70b18aae79ff2668b9c8a460985e144c5 100644
--- a/v3_23_0/CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd
+++ b/v3_23_0/CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-memory-v3_23_0.xsd b/v3_23_0/CDT-memory-v3_23_0.xsd
index 2da72ede50aa04785c84bb27430d73e09becff44..f8ed14ff98134b9b7197bd31512a341cf3772a79 100644
--- a/v3_23_0/CDT-memory-v3_23_0.xsd
+++ b/v3_23_0/CDT-memory-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-mgmtCmd-v3_23_0.xsd b/v3_23_0/CDT-mgmtCmd-v3_23_0.xsd
index 0256c0aef06a4a54650cc7cfef8612d543cb9dd4..9a940d53f2f1e376f539278804bc23adbbcc0837 100644
--- a/v3_23_0/CDT-mgmtCmd-v3_23_0.xsd
+++ b/v3_23_0/CDT-mgmtCmd-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-multimediaSession-v3_23_0.xsd b/v3_23_0/CDT-multimediaSession-v3_23_0.xsd
index 994e2a3ae5f339d70ae25daa5ab7ce012f3bb07b..b46e9b2eed7cf8f6c482e5de5047dd321be9d989 100644
--- a/v3_23_0/CDT-multimediaSession-v3_23_0.xsd
+++ b/v3_23_0/CDT-multimediaSession-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-node-v3_23_0.xsd b/v3_23_0/CDT-node-v3_23_0.xsd
index 08bc712b2b72bdad701d1de52948e728bb495aaf..a5d69ff5df72e6ea97a6218d176c296f88cc79f0 100644
--- a/v3_23_0/CDT-node-v3_23_0.xsd
+++ b/v3_23_0/CDT-node-v3_23_0.xsd
@@ -27,23 +27,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-schedule-v3_23_0.xsd"/>
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-notification-v3_23_0.xsd b/v3_23_0/CDT-notification-v3_23_0.xsd
index 3c6d57ff676559ddfa24653d5d4ec29d1ce7e867..debb9344a1267900d82a5719fcd4731d9bb1508b 100644
--- a/v3_23_0/CDT-notification-v3_23_0.xsd
+++ b/v3_23_0/CDT-notification-v3_23_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_22_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_23_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_23_0/CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd b/v3_23_0/CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd
index 492c25a13fa100f91760df6004a3ae9bfe3884df..c72ae604b73fd14411b9ddbf0d6d6144b339b199 100644
--- a/v3_23_0/CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd
+++ b/v3_23_0/CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-notificationTargetPolicy-v3_23_0.xsd b/v3_23_0/CDT-notificationTargetPolicy-v3_23_0.xsd
index 0aeb93d48ede9185b5dafbc8c2fdb895f031a28e..298cc9a3140771b1bfba66cb734fef78743d4794 100644
--- a/v3_23_0/CDT-notificationTargetPolicy-v3_23_0.xsd
+++ b/v3_23_0/CDT-notificationTargetPolicy-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-ontology-v3_23_0.xsd b/v3_23_0/CDT-ontology-v3_23_0.xsd
index 9cc95e587efa8d180e43d9eb5ea65efbb9b1583a..969ce0767cbf847e70ae8deeef18a8cea55dc13c 100644
--- a/v3_23_0/CDT-ontology-v3_23_0.xsd
+++ b/v3_23_0/CDT-ontology-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 	
 	<xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_23_0/CDT-ontologyRepository-v3_23_0.xsd b/v3_23_0/CDT-ontologyRepository-v3_23_0.xsd
index 6c71758f0ac3e27d4e007864809a4e36aef2b36f..34282e866c8152803563fded87f041a6e340c061 100644
--- a/v3_23_0/CDT-ontologyRepository-v3_23_0.xsd
+++ b/v3_23_0/CDT-ontologyRepository-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-ontology-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 	
 	<xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_23_0/CDT-policyDeletionRules-v3_23_0.xsd b/v3_23_0/CDT-policyDeletionRules-v3_23_0.xsd
index 0faf1e26f0cddff45d8de6bf7363708d74d3fc11..34f965edb50548a20bca36b460c398d50bd776be 100644
--- a/v3_23_0/CDT-policyDeletionRules-v3_23_0.xsd
+++ b/v3_23_0/CDT-policyDeletionRules-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-pollingChannel-v3_23_0.xsd b/v3_23_0/CDT-pollingChannel-v3_23_0.xsd
index 8966ccfdfe96f60824c99febbcc6a6b005219ee7..e19914aa36040472cc3abe6be193ec453022c8b8 100644
--- a/v3_23_0/CDT-pollingChannel-v3_23_0.xsd
+++ b/v3_23_0/CDT-pollingChannel-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-reboot-v3_23_0.xsd b/v3_23_0/CDT-reboot-v3_23_0.xsd
index 8c0a5f3c716dbc15cccb67387d8a257eaabfea50..b1a44fb433189be4b18bbaac26e83e7e494697e6 100644
--- a/v3_23_0/CDT-reboot-v3_23_0.xsd
+++ b/v3_23_0/CDT-reboot-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-remoteCSE-v3_23_0.xsd b/v3_23_0/CDT-remoteCSE-v3_23_0.xsd
index 952361e1567507983cb06fbfe1e551d48637d059..b4f2577a0a143f2cccdae9a3ac420d7637878d04 100644
--- a/v3_23_0/CDT-remoteCSE-v3_23_0.xsd
+++ b/v3_23_0/CDT-remoteCSE-v3_23_0.xsd
@@ -26,22 +26,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-ontologyRepository-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transactionMgmt-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd" />
 						
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-request-v3_23_0.xsd b/v3_23_0/CDT-request-v3_23_0.xsd
index 852207ae1c0352aac4b0f256c89a6235b15446ed..cc3e8781f1c03cea4fb50e178bfdab7cbff64858 100644
--- a/v3_23_0/CDT-request-v3_23_0.xsd
+++ b/v3_23_0/CDT-request-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-requestPrimitive-v3_23_0.xsd b/v3_23_0/CDT-requestPrimitive-v3_23_0.xsd
index 6f098f9a88893eee44e321d10a298922550841a2..8a9393ea687e777b1039295dcc4b6608d8876cd5 100644
--- a/v3_23_0/CDT-requestPrimitive-v3_23_0.xsd
+++ b/v3_23_0/CDT-requestPrimitive-v3_23_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_23_0/CDT-responsePrimitive-v3_23_0.xsd b/v3_23_0/CDT-responsePrimitive-v3_23_0.xsd
index b4b25845d4095f3140242e53da01319d3aa25d8e..7608de6da424b7d980d79e35374a01468a75555f 100644
--- a/v3_23_0/CDT-responsePrimitive-v3_23_0.xsd
+++ b/v3_23_0/CDT-responsePrimitive-v3_23_0.xsd
@@ -28,54 +28,54 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_22_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_22_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_23_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_23_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_23_0/CDT-role-v3_23_0.xsd b/v3_23_0/CDT-role-v3_23_0.xsd
index b54270ff4d98b4c4d7909647e86d940a6f608278..e83166a36074217cd6ee032316806609bc39c02a 100644
--- a/v3_23_0/CDT-role-v3_23_0.xsd
+++ b/v3_23_0/CDT-role-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-schedule-v3_23_0.xsd b/v3_23_0/CDT-schedule-v3_23_0.xsd
index 455a199ae270ce91322a19536b42796c0708b8b6..742dc2bc3e64023b1f6d10ea634e08e97daa0177 100644
--- a/v3_23_0/CDT-schedule-v3_23_0.xsd
+++ b/v3_23_0/CDT-schedule-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-semanticDescriptor-v3_23_0.xsd b/v3_23_0/CDT-semanticDescriptor-v3_23_0.xsd
index f06a0fb0cee983adbb8e201f7130243a4010f3be..ee28ba0a95db1689d470a93dbcee58e7f95cb514 100644
--- a/v3_23_0/CDT-semanticDescriptor-v3_23_0.xsd
+++ b/v3_23_0/CDT-semanticDescriptor-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-semanticMashupInstance-v3_23_0.xsd b/v3_23_0/CDT-semanticMashupInstance-v3_23_0.xsd
index 905590a34cf8114a246bd2ec8fd458973ad965f1..d2b68ba8e045cfb8a99d0efd61f159f9f10ebfe9 100644
--- a/v3_23_0/CDT-semanticMashupInstance-v3_23_0.xsd
+++ b/v3_23_0/CDT-semanticMashupInstance-v3_23_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupResult-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 	<xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-semanticMashupJobProfile-v3_23_0.xsd b/v3_23_0/CDT-semanticMashupJobProfile-v3_23_0.xsd
index a2fce82e6e28febcf246d4e0ecb744a7008694bf..b19f6c915a6d010cc16447d3f240188c4331e233 100644
--- a/v3_23_0/CDT-semanticMashupJobProfile-v3_23_0.xsd
+++ b/v3_23_0/CDT-semanticMashupJobProfile-v3_23_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 	<xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-semanticMashupResult-v3_23_0.xsd b/v3_23_0/CDT-semanticMashupResult-v3_23_0.xsd
index fd286d7fe5b06d6de92fd3d9c0b75bf1df67e611..0a2d0163edc04bd347f2b940cf54ca31d82951ea 100644
--- a/v3_23_0/CDT-semanticMashupResult-v3_23_0.xsd
+++ b/v3_23_0/CDT-semanticMashupResult-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-serviceSubscribedAppRule-v3_23_0.xsd b/v3_23_0/CDT-serviceSubscribedAppRule-v3_23_0.xsd
index 19cf73c26e277ffa36e629ea3839bcfbcb1ade52..99c82142c17838629a5259e6029085cf7396db59 100644
--- a/v3_23_0/CDT-serviceSubscribedAppRule-v3_23_0.xsd
+++ b/v3_23_0/CDT-serviceSubscribedAppRule-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-serviceSubscribedNode-v3_23_0.xsd b/v3_23_0/CDT-serviceSubscribedNode-v3_23_0.xsd
index fda176e6bd00cd736802961f86b6b01d829a04d6..cd84dc8353b90b12323231d0759aa0aeeccdb3ce 100644
--- a/v3_23_0/CDT-serviceSubscribedNode-v3_23_0.xsd
+++ b/v3_23_0/CDT-serviceSubscribedNode-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-software-v3_23_0.xsd b/v3_23_0/CDT-software-v3_23_0.xsd
index 3f9183d2536bb081ed08ba50a9068433d4a95e0a..8620e9c5db6b84c7fab1e7e133d08ecd4128e886 100644
--- a/v3_23_0/CDT-software-v3_23_0.xsd
+++ b/v3_23_0/CDT-software-v3_23_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-statsCollect-v3_23_0.xsd b/v3_23_0/CDT-statsCollect-v3_23_0.xsd
index 552cdcea065c655fbb6bc10d2e3ea4a1541aa65a..fc6725e18273ff0a834ef3207547f128050a7610 100644
--- a/v3_23_0/CDT-statsCollect-v3_23_0.xsd
+++ b/v3_23_0/CDT-statsCollect-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-statsConfig-v3_23_0.xsd b/v3_23_0/CDT-statsConfig-v3_23_0.xsd
index 35fc4b3119e74a7f8e45da93d1e4aa40c8933d99..c6b870f09d625dbfb6a1e3e1d31093d6351afcf6 100644
--- a/v3_23_0/CDT-statsConfig-v3_23_0.xsd
+++ b/v3_23_0/CDT-statsConfig-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-subscription-v3_23_0.xsd b/v3_23_0/CDT-subscription-v3_23_0.xsd
index 92401a96d5cef5c0046b01e765079b5be4a73ff1..d937e2bec17e78e51b1908255eed367731358c95 100644
--- a/v3_23_0/CDT-subscription-v3_23_0.xsd
+++ b/v3_23_0/CDT-subscription-v3_23_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-svcFwWrapper-v3_23_0.xsd b/v3_23_0/CDT-svcFwWrapper-v3_23_0.xsd
index 2193c6d1d95c930e8a2674e059ddb6dc7c8ad8d9..894e91e35bc88986a93f0b96c83dbb33bea3ff32 100644
--- a/v3_23_0/CDT-svcFwWrapper-v3_23_0.xsd
+++ b/v3_23_0/CDT-svcFwWrapper-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-svcObjWrapper-v3_23_0.xsd b/v3_23_0/CDT-svcObjWrapper-v3_23_0.xsd
index 7f26bff789e02ced4a5bdd57c8ae04141880020b..8e79e2f0fbedfae4800166cb8e86c8c6c23a4510 100644
--- a/v3_23_0/CDT-svcObjWrapper-v3_23_0.xsd
+++ b/v3_23_0/CDT-svcObjWrapper-v3_23_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_23_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-timeSeries-v3_23_0.xsd b/v3_23_0/CDT-timeSeries-v3_23_0.xsd
index c739ff68129be53478a36bed64c013312daf62c3..15596b23fcd5fc5dc2512f92a0984fe3be8d1ff4 100644
--- a/v3_23_0/CDT-timeSeries-v3_23_0.xsd
+++ b/v3_23_0/CDT-timeSeries-v3_23_0.xsd
@@ -26,11 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_23_0/CDT-timeSeriesInstance-v3_23_0.xsd b/v3_23_0/CDT-timeSeriesInstance-v3_23_0.xsd
index 2fb0824427400c61f9f6b9f4f81d6306bf4f7942..b2767e232a907ab3c167f4b974215e442f31915b 100644
--- a/v3_23_0/CDT-timeSeriesInstance-v3_23_0.xsd
+++ b/v3_23_0/CDT-timeSeriesInstance-v3_23_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_23_0.xsd"/>
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-token-v3_23_0.xsd b/v3_23_0/CDT-token-v3_23_0.xsd
index 08b473569373d7b9326621b71d9483e3e471a788..a27ae7ef0328aab582da968cac9bbc8b5976b11d 100644
--- a/v3_23_0/CDT-token-v3_23_0.xsd
+++ b/v3_23_0/CDT-token-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 	
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_23_0/CDT-transaction-v3_23_0.xsd b/v3_23_0/CDT-transaction-v3_23_0.xsd
index b99a5ca7675fcc50ddb67e53937a61d21b0f9739..629ce772ef47525bd2a8d007441fb4b2b087eaec 100644
--- a/v3_23_0/CDT-transaction-v3_23_0.xsd
+++ b/v3_23_0/CDT-transaction-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_23_0.xsd" />
 
 	<xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-transactionMgmt-v3_23_0.xsd b/v3_23_0/CDT-transactionMgmt-v3_23_0.xsd
index be250d4239d8c75b66051b9cfd1234c2edb32926..fb393a63d858ff2baa64b37ca4f74436430c049c 100644
--- a/v3_23_0/CDT-transactionMgmt-v3_23_0.xsd
+++ b/v3_23_0/CDT-transactionMgmt-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-responsePrimitive-v3_23_0.xsd" />
 
 	<xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-triggerPayload-v3_23_0.xsd b/v3_23_0/CDT-triggerPayload-v3_23_0.xsd
index 1249d1f403a7544fafdebee9df9f84393179a62d..48bdc59e37771474196d5d384a2b41cca405a2ea 100644
--- a/v3_23_0/CDT-triggerPayload-v3_23_0.xsd
+++ b/v3_23_0/CDT-triggerPayload-v3_23_0.xsd
@@ -27,7 +27,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" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_23_0/CDT-triggerRequest-v3_23_0.xsd b/v3_23_0/CDT-triggerRequest-v3_23_0.xsd
index de51f17a5a080b6dc737feab0f36d2c6a59c13a5..4a08dcdfe4483d8b1664113731a2db656e222f0a 100644
--- a/v3_23_0/CDT-triggerRequest-v3_23_0.xsd
+++ b/v3_23_0/CDT-triggerRequest-v3_23_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_22_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_23_0.xsd" />
+	<xs:include schemaLocation="CDT-transaction-v3_23_0.xsd"/>
 
 	<xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>