diff --git a/v3_22_0/CDT-AE-v3_22_0.xsd b/v3_22_0/CDT-AE-v3_22_0.xsd
index 0c10c1d53339a99c79bf8438d4f0b1c37718d85f..371fb53af9d5074804669c5959b095a89fd3b137 100644
--- a/v3_22_0/CDT-AE-v3_22_0.xsd
+++ b/v3_22_0/CDT-AE-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-multimediaSession-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-triggerRequest-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd" />
+	<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:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-AEContactList-v3_22_0.xsd b/v3_22_0/CDT-AEContactList-v3_22_0.xsd
index 5b7a2505b4126171f12e7f857334566c042a740b..1f09590789cae9b9612ee60f0d30b4bcc829bfdb 100644
--- a/v3_22_0/CDT-AEContactList-v3_22_0.xsd
+++ b/v3_22_0/CDT-AEContactList-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-AEContactListPerCSE-v3_22_0.xsd b/v3_22_0/CDT-AEContactListPerCSE-v3_22_0.xsd
index 6e8ef451d4f74818e2a03d7bec69c77152513572..7c20786dbb91f85c13b65246e7eb45e6a505adbf 100644
--- a/v3_22_0/CDT-AEContactListPerCSE-v3_22_0.xsd
+++ b/v3_22_0/CDT-AEContactListPerCSE-v3_22_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_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
 
 	<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-CSEBase-v3_22_0.xsd b/v3_22_0/CDT-CSEBase-v3_22_0.xsd
index b588db64ce2c4c11cdfc9c6da78ee9ad874a3ce7..0a0036272a0f3c9c081729fba03b375e433e2817 100644
--- a/v3_22_0/CDT-CSEBase-v3_22_0.xsd
+++ b/v3_22_0/CDT-CSEBase-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_21_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationDecision-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationPolicy-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-authorizationInformation-v3_21_0.xsd" />   
-    <xs:include schemaLocation="CDT-ontologyRepository-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-semanticMashupInstance-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-AEContactList-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-localMulticastGroup-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-crossResourceSubscription-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-transactionMgmt-v3_21_0.xsd" />
-    <xs:include schemaLocation="CDT-transaction-v3_21_0.xsd" />
+	<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:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-accessControlPolicy-v3_22_0.xsd b/v3_22_0/CDT-accessControlPolicy-v3_22_0.xsd
index 12b434578bbf9972b12c538f75bf7aae8b0c1e22..0fed8ea2f772a104ec054a63ba64cbc41d2e2b32 100644
--- a/v3_22_0/CDT-accessControlPolicy-v3_22_0.xsd
+++ b/v3_22_0/CDT-accessControlPolicy-v3_22_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_21_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd"/>
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-activeCmdhPolicy-v3_22_0.xsd b/v3_22_0/CDT-activeCmdhPolicy-v3_22_0.xsd
index 4f0a5fc13eca6bab8a6c4ece830ef12651b36b9b..1b4c251e0e27d543f3c877dfd2cfae7ea7afdd1c 100644
--- a/v3_22_0/CDT-activeCmdhPolicy-v3_22_0.xsd
+++ b/v3_22_0/CDT-activeCmdhPolicy-v3_22_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_21_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_22_0/CDT-allJoynApp-v3_22_0.xsd b/v3_22_0/CDT-allJoynApp-v3_22_0.xsd
index f54e637ce2d68b0bfeb5274d1820546f085048ce..9994cd48c9b840fc6304f5007a72dfd3a696c58c 100644
--- a/v3_22_0/CDT-allJoynApp-v3_22_0.xsd
+++ b/v3_22_0/CDT-allJoynApp-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_21_0.xsd" />
+	<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:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-allJoynInterface-v3_22_0.xsd b/v3_22_0/CDT-allJoynInterface-v3_22_0.xsd
index 17e2a9b3d00e1dbd1793af783e99be9c031aa6a3..757bc1f0f707e4141bedc9eb99fea6618ee95fc5 100644
--- a/v3_22_0/CDT-allJoynInterface-v3_22_0.xsd
+++ b/v3_22_0/CDT-allJoynInterface-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_21_0.xsd" />
+	<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:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_22_0/CDT-allJoynMethod-v3_22_0.xsd b/v3_22_0/CDT-allJoynMethod-v3_22_0.xsd
index beb2f149d7bc84c9cc28bedece4aa0c230c0904b..2ac5ca788619415cffd08d17d67f0085266ef699 100644
--- a/v3_22_0/CDT-allJoynMethod-v3_22_0.xsd
+++ b/v3_22_0/CDT-allJoynMethod-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_21_0.xsd" />
+	<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:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_22_0/CDT-allJoynMethodCall-v3_22_0.xsd b/v3_22_0/CDT-allJoynMethodCall-v3_22_0.xsd
index 70ff112d1031250349fb9bd81f86f430a9392e5a..0dd528fd30351257f5d0ba328ae7f584febace3e 100644
--- a/v3_22_0/CDT-allJoynMethodCall-v3_22_0.xsd
+++ b/v3_22_0/CDT-allJoynMethodCall-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<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:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-allJoynProperty-v3_22_0.xsd b/v3_22_0/CDT-allJoynProperty-v3_22_0.xsd
index 5db1cf7433d68987da18bc96d310748968d398bc..71928ab15a66354b70db49dee92333cdc7f8abc8 100644
--- a/v3_22_0/CDT-allJoynProperty-v3_22_0.xsd
+++ b/v3_22_0/CDT-allJoynProperty-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<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:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-allJoynSvcObject-v3_22_0.xsd b/v3_22_0/CDT-allJoynSvcObject-v3_22_0.xsd
index 37fa827c575a4f60717f287b4d486018d1e73a57..268536e07d17ba94170a7d87d740cd75bfabec7e 100644
--- a/v3_22_0/CDT-allJoynSvcObject-v3_22_0.xsd
+++ b/v3_22_0/CDT-allJoynSvcObject-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_21_0.xsd" />
+	<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:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-areaNwkDeviceInfo-v3_22_0.xsd b/v3_22_0/CDT-areaNwkDeviceInfo-v3_22_0.xsd
index a36ab6c6ff301b222c1a2538e91067a9824444a1..bc68712684c5ffd6cc01f9c49929090141714691 100644
--- a/v3_22_0/CDT-areaNwkDeviceInfo-v3_22_0.xsd
+++ b/v3_22_0/CDT-areaNwkDeviceInfo-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-areaNwkInfo-v3_22_0.xsd b/v3_22_0/CDT-areaNwkInfo-v3_22_0.xsd
index 67cd30bf9346f1561b02df16a24e835d4d39de14..4bafbef49e1dfa2034e13a1c6031b6a4a98d994a 100644
--- a/v3_22_0/CDT-areaNwkInfo-v3_22_0.xsd
+++ b/v3_22_0/CDT-areaNwkInfo-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-authorizationDecision-v3_22_0.xsd b/v3_22_0/CDT-authorizationDecision-v3_22_0.xsd
index 3a810e2f9bbb7a42b214b1b0ea6b579d6664909d..827cd299f573bfac8d8fb808a641ab761f66c52f 100644
--- a/v3_22_0/CDT-authorizationDecision-v3_22_0.xsd
+++ b/v3_22_0/CDT-authorizationDecision-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-authorizationInformation-v3_22_0.xsd b/v3_22_0/CDT-authorizationInformation-v3_22_0.xsd
index d851f65d7e93fa30a9bc816ac0ec830f25628c78..f103f34f6587bcb822a264e04f1fa6c66b9743a4 100644
--- a/v3_22_0/CDT-authorizationInformation-v3_22_0.xsd
+++ b/v3_22_0/CDT-authorizationInformation-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-role-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-token-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-authorizationPolicy-v3_22_0.xsd b/v3_22_0/CDT-authorizationPolicy-v3_22_0.xsd
index b877a0d317e7bf94cceec1d8323ddccb073835a1..950152c6182673e9f5c66ac6011778c5f7f67cb3 100644
--- a/v3_22_0/CDT-authorizationPolicy-v3_22_0.xsd
+++ b/v3_22_0/CDT-authorizationPolicy-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-backgroundDataTransfer-v3_22_0.xsd b/v3_22_0/CDT-backgroundDataTransfer-v3_22_0.xsd
index 1f091d6c43e15e3ff2a2f66bfaf5e6a70cc45667..2663845ad8a92952a427c4519eb86c4fc98c231c 100644
--- a/v3_22_0/CDT-backgroundDataTransfer-v3_22_0.xsd
+++ b/v3_22_0/CDT-backgroundDataTransfer-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 
 	<xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-battery-v3_22_0.xsd b/v3_22_0/CDT-battery-v3_22_0.xsd
index 1df31a5b057a8fc31b1e43351026caf47fd1fbca..25d1c8e3d3baaa9a62554cbb8b80114dc66c0902 100644
--- a/v3_22_0/CDT-battery-v3_22_0.xsd
+++ b/v3_22_0/CDT-battery-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-cmdhBuffer-v3_22_0.xsd b/v3_22_0/CDT-cmdhBuffer-v3_22_0.xsd
index ac297dcb15dd6c6442019e7f21c45e1904817634..a0c7457cff2f5b74f55a5a2ce823f27697a8927c 100644
--- a/v3_22_0/CDT-cmdhBuffer-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhBuffer-v3_22_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_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_22_0/CDT-cmdhDefEcValue-v3_22_0.xsd b/v3_22_0/CDT-cmdhDefEcValue-v3_22_0.xsd
index 647a6e3d3b213d631df4263ff678cf72ec2d732d..f87cdff5a78b3a2704a30d7b1aa48d6080fa5da1 100644
--- a/v3_22_0/CDT-cmdhDefEcValue-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhDefEcValue-v3_22_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_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_22_0/CDT-cmdhDefaults-v3_22_0.xsd b/v3_22_0/CDT-cmdhDefaults-v3_22_0.xsd
index 92e3dba260cc85903f1aab855968669656344f96..5c9a226208fed211cfe12fc34376f46abefafdea 100644
--- a/v3_22_0/CDT-cmdhDefaults-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhDefaults-v3_22_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_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_22_0/CDT-cmdhEcDefParamValues-v3_22_0.xsd b/v3_22_0/CDT-cmdhEcDefParamValues-v3_22_0.xsd
index 6819b6aea68e4e0f2eb27425301e7d11ebf64d04..e96bf2c63f25dfc6f05c5ae0109bbcb344d3ba30 100644
--- a/v3_22_0/CDT-cmdhEcDefParamValues-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhEcDefParamValues-v3_22_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_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_22_0/CDT-cmdhLimits-v3_22_0.xsd b/v3_22_0/CDT-cmdhLimits-v3_22_0.xsd
index b414a2d0a2018a7810e1dba072d416723a3b0f90..00f4dca429017c6b0e297e45f29428c765e05ceb 100644
--- a/v3_22_0/CDT-cmdhLimits-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhLimits-v3_22_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_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_22_0/CDT-cmdhNetworkAccessRules-v3_22_0.xsd b/v3_22_0/CDT-cmdhNetworkAccessRules-v3_22_0.xsd
index 3cf9a5f5889f173ce23175193f11dc46b5f6b016..2cf722d3b318abda8e8750621c913ca0f0a57eed 100644
--- a/v3_22_0/CDT-cmdhNetworkAccessRules-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhNetworkAccessRules-v3_22_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_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_22_0/CDT-cmdhNwAccessRule-v3_22_0.xsd b/v3_22_0/CDT-cmdhNwAccessRule-v3_22_0.xsd
index a64b2d6fce20bcfbcc6d872b088a1741b42eec2b..db23f74169aa84b9fad35219ab982839e5f32254 100644
--- a/v3_22_0/CDT-cmdhNwAccessRule-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhNwAccessRule-v3_22_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_21_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_22_0/CDT-cmdhPolicy-v3_22_0.xsd b/v3_22_0/CDT-cmdhPolicy-v3_22_0.xsd
index 8741660bb16b6e2e378d4cb2e882369f145d65a3..ac884a0f48ed23c66d024432227fbbe87df8a158 100644
--- a/v3_22_0/CDT-cmdhPolicy-v3_22_0.xsd
+++ b/v3_22_0/CDT-cmdhPolicy-v3_22_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_21_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_22_0/CDT-commonTypes-v3_22_0.xsd b/v3_22_0/CDT-commonTypes-v3_22_0.xsd
index 4c967a2cf5dec10b2b28272eedc73b77d62ffef0..e47485ada5d7854e5c10695b1cf7b9d4335f26de 100644
--- a/v3_22_0/CDT-commonTypes-v3_22_0.xsd
+++ b/v3_22_0/CDT-commonTypes-v3_22_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_21_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_22_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_22_0/CDT-container-v3_22_0.xsd b/v3_22_0/CDT-container-v3_22_0.xsd
index 3e61f798c41b85518d808affe0f42f8ee277b634..49ae83d894e1e2979f4cd7c2c871b1e55c41b315 100644
--- a/v3_22_0/CDT-container-v3_22_0.xsd
+++ b/v3_22_0/CDT-container-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_22_0/CDT-contentInstance-v3_22_0.xsd b/v3_22_0/CDT-contentInstance-v3_22_0.xsd
index 47b33a0a24fd4f62a60a4d54029074185340b054..54bcb8caf9d23594d2255f890759d368c821fb1f 100644
--- a/v3_22_0/CDT-contentInstance-v3_22_0.xsd
+++ b/v3_22_0/CDT-contentInstance-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-crossResourceSubscription-v3_22_0.xsd b/v3_22_0/CDT-crossResourceSubscription-v3_22_0.xsd
index eab2c54f858e628797598891c3a4eee01df75350..4e8f37fe06d8cb044c5675d42b41bbcf1b101f32 100644
--- a/v3_22_0/CDT-crossResourceSubscription-v3_22_0.xsd
+++ b/v3_22_0/CDT-crossResourceSubscription-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-delivery-v3_22_0.xsd b/v3_22_0/CDT-delivery-v3_22_0.xsd
index bcbd4f969b14c3d92b0955ab3007f35058865fd7..f5d25aab1d9d08fd907a9542c6dc1cc87c5480ee 100644
--- a/v3_22_0/CDT-delivery-v3_22_0.xsd
+++ b/v3_22_0/CDT-delivery-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_22_0/CDT-deviceCapability-v3_22_0.xsd b/v3_22_0/CDT-deviceCapability-v3_22_0.xsd
index 82b82e634ef50e4773fe3d6f8a3d89d44bdff99b..6b404fd6255bd8c65b5b0c1df4a50b02a0b68ce9 100644
--- a/v3_22_0/CDT-deviceCapability-v3_22_0.xsd
+++ b/v3_22_0/CDT-deviceCapability-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-deviceInfo-v3_22_0.xsd b/v3_22_0/CDT-deviceInfo-v3_22_0.xsd
index 859a0442cbbdc7988d7c0c58ebbc35af12fd698e..69260e9f27173004cb71f23ce71414cd6d60d79b 100644
--- a/v3_22_0/CDT-deviceInfo-v3_22_0.xsd
+++ b/v3_22_0/CDT-deviceInfo-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-dynamicAuthorizationConsultation-v3_22_0.xsd b/v3_22_0/CDT-dynamicAuthorizationConsultation-v3_22_0.xsd
index a1d4b3c5c8ea0ad49b2c46593bc36fb82b193f30..3bb9b270022da8f87034687cebd52f329d1f6a86 100644
--- a/v3_22_0/CDT-dynamicAuthorizationConsultation-v3_22_0.xsd
+++ b/v3_22_0/CDT-dynamicAuthorizationConsultation-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-eventConfig-v3_22_0.xsd b/v3_22_0/CDT-eventConfig-v3_22_0.xsd
index 70a3e6bf4385af6e19d24aee448d4b7e06e162ce..21b8f2b1c02756787799c6de996d3298f22a6c07 100644
--- a/v3_22_0/CDT-eventConfig-v3_22_0.xsd
+++ b/v3_22_0/CDT-eventConfig-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-eventLog-v3_22_0.xsd b/v3_22_0/CDT-eventLog-v3_22_0.xsd
index f07cf2254ae2f1dd857c17060cc2655e3b6316a9..a87c6d0bac055696a65d8ac277d1785f2ef86e0b 100644
--- a/v3_22_0/CDT-eventLog-v3_22_0.xsd
+++ b/v3_22_0/CDT-eventLog-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-execInstance-v3_22_0.xsd b/v3_22_0/CDT-execInstance-v3_22_0.xsd
index 039d82cc8198b7dc52843a2467788a8a76b87679..aed0b6ed286c2c5f3eb361baef768ef7e644206e 100644
--- a/v3_22_0/CDT-execInstance-v3_22_0.xsd
+++ b/v3_22_0/CDT-execInstance-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-firmware-v3_22_0.xsd b/v3_22_0/CDT-firmware-v3_22_0.xsd
index 70f79aca35f735c11f4e2106b62caaa65f1b256c..2162b1f81d988a62623dec1f10834875092edb6a 100644
--- a/v3_22_0/CDT-firmware-v3_22_0.xsd
+++ b/v3_22_0/CDT-firmware-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-genericInterworkingOperationInstance-v3_22_0.xsd b/v3_22_0/CDT-genericInterworkingOperationInstance-v3_22_0.xsd
index 06fe6cf45ebc759248f015c0f48c3b7078339448..9d620106292649dfcdd15ed5a758d349866006cc 100644
--- a/v3_22_0/CDT-genericInterworkingOperationInstance-v3_22_0.xsd
+++ b/v3_22_0/CDT-genericInterworkingOperationInstance-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<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:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-genericInterworkingService-v3_22_0.xsd b/v3_22_0/CDT-genericInterworkingService-v3_22_0.xsd
index d881019b5a98b9d853c1357488b63a54f2940cd0..6d65bb13b27abbcaa843cadf12a27d5d315a8813 100644
--- a/v3_22_0/CDT-genericInterworkingService-v3_22_0.xsd
+++ b/v3_22_0/CDT-genericInterworkingService-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_21_0.xsd" />
+	<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:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-group-v3_22_0.xsd b/v3_22_0/CDT-group-v3_22_0.xsd
index 8f25563d3560fa148f5982ac9fc219b3dfc8da5d..a12f2916f07c18cfdf8d227a1b265ac831a3b9d6 100644
--- a/v3_22_0/CDT-group-v3_22_0.xsd
+++ b/v3_22_0/CDT-group-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="group" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_22_0/CDT-localMulticastGroup-v3_22_0.xsd b/v3_22_0/CDT-localMulticastGroup-v3_22_0.xsd
index eae277c5a4ae58eeab417fd0f5d39727da8ca27a..7d8e663757e745a5106592e053dc0f947e024af5 100644
--- a/v3_22_0/CDT-localMulticastGroup-v3_22_0.xsd
+++ b/v3_22_0/CDT-localMulticastGroup-v3_22_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_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
 	
 	<!-- resource typ e not implemented yet: -->
-	<!-- <xs:include schemaLocation="CDT-transaction-v3_21_0.xsd" />   -->
+	<!-- <xs:include schemaLocation="CDT-transaction-v3_22_0.xsd" />   -->
 
 
 	<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_22_0/CDT-locationPolicy-v3_22_0.xsd b/v3_22_0/CDT-locationPolicy-v3_22_0.xsd
index 9565f041e2607ff4743e02b5a9ab0b90698e1535..fdf48756a1c38eca13d596a193e01f886c52e178 100644
--- a/v3_22_0/CDT-locationPolicy-v3_22_0.xsd
+++ b/v3_22_0/CDT-locationPolicy-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-m2mServiceSubscriptionProfile-v3_22_0.xsd b/v3_22_0/CDT-m2mServiceSubscriptionProfile-v3_22_0.xsd
index d6cf6450494ef2122e2e3bc30fdd156e623555d8..30f5a8a6d8352925cbc62ebea25d5a601ca6fa37 100644
--- a/v3_22_0/CDT-m2mServiceSubscriptionProfile-v3_22_0.xsd
+++ b/v3_22_0/CDT-m2mServiceSubscriptionProfile-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-memory-v3_22_0.xsd b/v3_22_0/CDT-memory-v3_22_0.xsd
index 6b6d4c5c5fbc3483094bf943a0071249bb1e4707..2da72ede50aa04785c84bb27430d73e09becff44 100644
--- a/v3_22_0/CDT-memory-v3_22_0.xsd
+++ b/v3_22_0/CDT-memory-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-mgmtCmd-v3_22_0.xsd b/v3_22_0/CDT-mgmtCmd-v3_22_0.xsd
index 6374d5dfe85a87699fca94b5ec09a7a09de2bafd..0256c0aef06a4a54650cc7cfef8612d543cb9dd4 100644
--- a/v3_22_0/CDT-mgmtCmd-v3_22_0.xsd
+++ b/v3_22_0/CDT-mgmtCmd-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-multimediaSession-v3_22_0.xsd b/v3_22_0/CDT-multimediaSession-v3_22_0.xsd
index 166558473c1b006415eb5b328bf6ca12c1e5af59..994e2a3ae5f339d70ae25daa5ab7ce012f3bb07b 100644
--- a/v3_22_0/CDT-multimediaSession-v3_22_0.xsd
+++ b/v3_22_0/CDT-multimediaSession-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-node-v3_22_0.xsd b/v3_22_0/CDT-node-v3_22_0.xsd
index 672c1cf4f882bb9d1f12e9543c8df4ada0b96c0f..08bc712b2b72bdad701d1de52948e728bb495aaf 100644
--- a/v3_22_0/CDT-node-v3_22_0.xsd
+++ b/v3_22_0/CDT-node-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
-	<xs:include schemaLocation="CDT-schedule-v3_21_0.xsd"/>
+	<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:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-notification-v3_22_0.xsd b/v3_22_0/CDT-notification-v3_22_0.xsd
index 7d07bfa6e6a823ac884311d1e35429d26b3c45f2..3c6d57ff676559ddfa24653d5d4ec29d1ce7e867 100644
--- a/v3_22_0/CDT-notification-v3_22_0.xsd
+++ b/v3_22_0/CDT-notification-v3_22_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_21_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_21_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_22_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_22_0/CDT-notificationTargetMgmtPolicyRef-v3_22_0.xsd b/v3_22_0/CDT-notificationTargetMgmtPolicyRef-v3_22_0.xsd
index 9cff5b592642b4b0eb3d958c9ce4f5a1160595aa..492c25a13fa100f91760df6004a3ae9bfe3884df 100644
--- a/v3_22_0/CDT-notificationTargetMgmtPolicyRef-v3_22_0.xsd
+++ b/v3_22_0/CDT-notificationTargetMgmtPolicyRef-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-notificationTargetPolicy-v3_22_0.xsd b/v3_22_0/CDT-notificationTargetPolicy-v3_22_0.xsd
index 96924f303abc46eb10023cab19b85f23db1aa1ca..0aeb93d48ede9185b5dafbc8c2fdb895f031a28e 100644
--- a/v3_22_0/CDT-notificationTargetPolicy-v3_22_0.xsd
+++ b/v3_22_0/CDT-notificationTargetPolicy-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-ontology-v3_22_0.xsd b/v3_22_0/CDT-ontology-v3_22_0.xsd
index 424d5625ca83f1ca892428adfa59995db7d48686..9cc95e587efa8d180e43d9eb5ea65efbb9b1583a 100644
--- a/v3_22_0/CDT-ontology-v3_22_0.xsd
+++ b/v3_22_0/CDT-ontology-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_22_0/CDT-ontologyRepository-v3_22_0.xsd b/v3_22_0/CDT-ontologyRepository-v3_22_0.xsd
index a1b13dcbeabbf80df6894dcb126df97487f904a1..6c71758f0ac3e27d4e007864809a4e36aef2b36f 100644
--- a/v3_22_0/CDT-ontologyRepository-v3_22_0.xsd
+++ b/v3_22_0/CDT-ontologyRepository-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-ontology-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_22_0/CDT-policyDeletionRules-v3_22_0.xsd b/v3_22_0/CDT-policyDeletionRules-v3_22_0.xsd
index fd4aa550e52f2fd0261a10b6473c00c866a15851..0faf1e26f0cddff45d8de6bf7363708d74d3fc11 100644
--- a/v3_22_0/CDT-policyDeletionRules-v3_22_0.xsd
+++ b/v3_22_0/CDT-policyDeletionRules-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-pollingChannel-v3_22_0.xsd b/v3_22_0/CDT-pollingChannel-v3_22_0.xsd
index 0a2dfd5c9b6557797bcef9b656059010215be0dd..8966ccfdfe96f60824c99febbcc6a6b005219ee7 100644
--- a/v3_22_0/CDT-pollingChannel-v3_22_0.xsd
+++ b/v3_22_0/CDT-pollingChannel-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-reboot-v3_22_0.xsd b/v3_22_0/CDT-reboot-v3_22_0.xsd
index beb2cd0bb0abb3dd8ac507f9b0a23cf5a8fba34d..8c0a5f3c716dbc15cccb67387d8a257eaabfea50 100644
--- a/v3_22_0/CDT-reboot-v3_22_0.xsd
+++ b/v3_22_0/CDT-reboot-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-remoteCSE-v3_22_0.xsd b/v3_22_0/CDT-remoteCSE-v3_22_0.xsd
index be46a4b439a1710edefc919fb3bb43b0240946fa..952361e1567507983cb06fbfe1e551d48637d059 100644
--- a/v3_22_0/CDT-remoteCSE-v3_22_0.xsd
+++ b/v3_22_0/CDT-remoteCSE-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-ontologyRepository-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-crossResourceSubscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transactionMgmt-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd" />
+	<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:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-request-v3_22_0.xsd b/v3_22_0/CDT-request-v3_22_0.xsd
index 64a970954d014e5c2787840983a8fa24a2f324d9..852207ae1c0352aac4b0f256c89a6235b15446ed 100644
--- a/v3_22_0/CDT-request-v3_22_0.xsd
+++ b/v3_22_0/CDT-request-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-requestPrimitive-v3_22_0.xsd b/v3_22_0/CDT-requestPrimitive-v3_22_0.xsd
index 510ad3b79be18e48f99ad12be577de9d319f20e3..6f098f9a88893eee44e321d10a298922550841a2 100644
--- a/v3_22_0/CDT-requestPrimitive-v3_22_0.xsd
+++ b/v3_22_0/CDT-requestPrimitive-v3_22_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_21_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_22_0/CDT-responsePrimitive-v3_22_0.xsd b/v3_22_0/CDT-responsePrimitive-v3_22_0.xsd
index 4e68292e9bdede68ce5012955f73a34b11431d33..5a40fd768b1d4baf511736ef487d0a4194424048 100644
--- a/v3_22_0/CDT-responsePrimitive-v3_22_0.xsd
+++ b/v3_22_0/CDT-responsePrimitive-v3_22_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_21_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_21_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_21_0.xsd" />
+  <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:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_22_0/CDT-role-v3_22_0.xsd b/v3_22_0/CDT-role-v3_22_0.xsd
index 9d0b66f1bda6a3fd68c0bc230603ba2b3f8cc548..b54270ff4d98b4c4d7909647e86d940a6f608278 100644
--- a/v3_22_0/CDT-role-v3_22_0.xsd
+++ b/v3_22_0/CDT-role-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-schedule-v3_22_0.xsd b/v3_22_0/CDT-schedule-v3_22_0.xsd
index 5223f3e0d2980860c8b9486d015ed2fcb8f47240..455a199ae270ce91322a19536b42796c0708b8b6 100644
--- a/v3_22_0/CDT-schedule-v3_22_0.xsd
+++ b/v3_22_0/CDT-schedule-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-semanticDescriptor-v3_22_0.xsd b/v3_22_0/CDT-semanticDescriptor-v3_22_0.xsd
index 3371573fc9199d4dd126f41410dc66d86dae5f57..f06a0fb0cee983adbb8e201f7130243a4010f3be 100644
--- a/v3_22_0/CDT-semanticDescriptor-v3_22_0.xsd
+++ b/v3_22_0/CDT-semanticDescriptor-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-semanticMashupInstance-v3_22_0.xsd b/v3_22_0/CDT-semanticMashupInstance-v3_22_0.xsd
index 6adbf5b7dfe4162b52a779616cc8734d9152f6c3..905590a34cf8114a246bd2ec8fd458973ad965f1 100644
--- a/v3_22_0/CDT-semanticMashupInstance-v3_22_0.xsd
+++ b/v3_22_0/CDT-semanticMashupInstance-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupResult-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-semanticMashupJobProfile-v3_22_0.xsd b/v3_22_0/CDT-semanticMashupJobProfile-v3_22_0.xsd
index d01766cd4624c4a5bf515522c553853de34d613b..a2fce82e6e28febcf246d4e0ecb744a7008694bf 100644
--- a/v3_22_0/CDT-semanticMashupJobProfile-v3_22_0.xsd
+++ b/v3_22_0/CDT-semanticMashupJobProfile-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticMashupInstance-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-semanticMashupResult-v3_22_0.xsd b/v3_22_0/CDT-semanticMashupResult-v3_22_0.xsd
index fa8e324438784ccf89aaf07b9a4200f9c4424a80..fd286d7fe5b06d6de92fd3d9c0b75bf1df67e611 100644
--- a/v3_22_0/CDT-semanticMashupResult-v3_22_0.xsd
+++ b/v3_22_0/CDT-semanticMashupResult-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_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:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-serviceSubscribedAppRule-v3_22_0.xsd b/v3_22_0/CDT-serviceSubscribedAppRule-v3_22_0.xsd
index 3cac427ecd12251cccd55678a06c663bd76142cd..19cf73c26e277ffa36e629ea3839bcfbcb1ade52 100644
--- a/v3_22_0/CDT-serviceSubscribedAppRule-v3_22_0.xsd
+++ b/v3_22_0/CDT-serviceSubscribedAppRule-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-serviceSubscribedNode-v3_22_0.xsd b/v3_22_0/CDT-serviceSubscribedNode-v3_22_0.xsd
index b2184584c146e6df2b47e5e803bebb49f8937d1d..fda176e6bd00cd736802961f86b6b01d829a04d6 100644
--- a/v3_22_0/CDT-serviceSubscribedNode-v3_22_0.xsd
+++ b/v3_22_0/CDT-serviceSubscribedNode-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-software-v3_22_0.xsd b/v3_22_0/CDT-software-v3_22_0.xsd
index cbc0876a418d5841692db0691dac69a6649e5a3f..3f9183d2536bb081ed08ba50a9068433d4a95e0a 100644
--- a/v3_22_0/CDT-software-v3_22_0.xsd
+++ b/v3_22_0/CDT-software-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_22_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-statsCollect-v3_22_0.xsd b/v3_22_0/CDT-statsCollect-v3_22_0.xsd
index 26f8df4f5526938c1a10bb86c392750d7dbe019a..552cdcea065c655fbb6bc10d2e3ea4a1541aa65a 100644
--- a/v3_22_0/CDT-statsCollect-v3_22_0.xsd
+++ b/v3_22_0/CDT-statsCollect-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-statsConfig-v3_22_0.xsd b/v3_22_0/CDT-statsConfig-v3_22_0.xsd
index 753a470dd5b225d0ffb0eca09d568219c85078f9..35fc4b3119e74a7f8e45da93d1e4aa40c8933d99 100644
--- a/v3_22_0/CDT-statsConfig-v3_22_0.xsd
+++ b/v3_22_0/CDT-statsConfig-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-subscription-v3_22_0.xsd b/v3_22_0/CDT-subscription-v3_22_0.xsd
index c0b0106dc75782dec5f50253760b1155fcf02275..92401a96d5cef5c0046b01e765079b5be4a73ff1 100644
--- a/v3_22_0/CDT-subscription-v3_22_0.xsd
+++ b/v3_22_0/CDT-subscription-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-svcFwWrapper-v3_22_0.xsd b/v3_22_0/CDT-svcFwWrapper-v3_22_0.xsd
index 03e4af15e2fb353f0d6afb21dd433793cc4b701d..2193c6d1d95c930e8a2674e059ddb6dc7c8ad8d9 100644
--- a/v3_22_0/CDT-svcFwWrapper-v3_22_0.xsd
+++ b/v3_22_0/CDT-svcFwWrapper-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
+	<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:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-svcObjWrapper-v3_22_0.xsd b/v3_22_0/CDT-svcObjWrapper-v3_22_0.xsd
index 8f4ab890232dc3f9eea9d434aa4355916267c28a..7f26bff789e02ced4a5bdd57c8ae04141880020b 100644
--- a/v3_22_0/CDT-svcObjWrapper-v3_22_0.xsd
+++ b/v3_22_0/CDT-svcObjWrapper-v3_22_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_21_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_21_0.xsd" />
+	<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:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-timeSeries-v3_22_0.xsd b/v3_22_0/CDT-timeSeries-v3_22_0.xsd
index fe42925e12f92c56a44e3b0002c50049a817ce56..c739ff68129be53478a36bed64c013312daf62c3 100644
--- a/v3_22_0/CDT-timeSeries-v3_22_0.xsd
+++ b/v3_22_0/CDT-timeSeries-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_22_0/CDT-timeSeriesInstance-v3_22_0.xsd b/v3_22_0/CDT-timeSeriesInstance-v3_22_0.xsd
index f633c58bee571d52a3d560d8bbad40e223d86522..2fb0824427400c61f9f6b9f4f81d6306bf4f7942 100644
--- a/v3_22_0/CDT-timeSeriesInstance-v3_22_0.xsd
+++ b/v3_22_0/CDT-timeSeriesInstance-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_21_0.xsd"/>
+	<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:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-token-v3_22_0.xsd b/v3_22_0/CDT-token-v3_22_0.xsd
index e09c20daf823bd8a8221c236e313235791b2adda..08b473569373d7b9326621b71d9483e3e471a788 100644
--- a/v3_22_0/CDT-token-v3_22_0.xsd
+++ b/v3_22_0/CDT-token-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="token" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_22_0/CDT-transaction-v3_22_0.xsd b/v3_22_0/CDT-transaction-v3_22_0.xsd
index 13765a7e05e59a36830f1f5b7331d280360450d9..b99a5ca7675fcc50ddb67e53937a61d21b0f9739 100644
--- a/v3_22_0/CDT-transaction-v3_22_0.xsd
+++ b/v3_22_0/CDT-transaction-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_21_0.xsd" />
+	<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:element name="transaction" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-transactionMgmt-v3_22_0.xsd b/v3_22_0/CDT-transactionMgmt-v3_22_0.xsd
index bca6499dcb80d72080ca79604832414d373e68a9..be250d4239d8c75b66051b9cfd1234c2edb32926 100644
--- a/v3_22_0/CDT-transactionMgmt-v3_22_0.xsd
+++ b/v3_22_0/CDT-transactionMgmt-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-responsePrimitive-v3_21_0.xsd" />
+	<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:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-triggerPayload-v3_22_0.xsd b/v3_22_0/CDT-triggerPayload-v3_22_0.xsd
index d954d6a7dad1e790da75aa7233e99baf2bcfcdf1..1249d1f403a7544fafdebee9df9f84393179a62d 100644
--- a/v3_22_0/CDT-triggerPayload-v3_22_0.xsd
+++ b/v3_22_0/CDT-triggerPayload-v3_22_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_21_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_22_0.xsd" />
 	
 	<xs:element name="triggerPayload">
 		<xs:complexType>
diff --git a/v3_22_0/CDT-triggerRequest-v3_22_0.xsd b/v3_22_0/CDT-triggerRequest-v3_22_0.xsd
index 46e97060a6da481fad9368647da9a23eaaa7be03..de51f17a5a080b6dc737feab0f36d2c6a59c13a5 100644
--- a/v3_22_0/CDT-triggerRequest-v3_22_0.xsd
+++ b/v3_22_0/CDT-triggerRequest-v3_22_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_21_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_21_0.xsd" />
-	<xs:include schemaLocation="CDT-transaction-v3_21_0.xsd"/>
+	<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:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>