From 1b170be7c92ffb4cd6d88c305eb64df1e10f8837 Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Thu, 17 Jun 2021 11:06:24 +0100
Subject: [PATCH] Change include statements to reference 3_22_0

---
 v3_22_0/CDT-AE-v3_22_0.xsd                    | 28 +++---
 v3_22_0/CDT-AEContactList-v3_22_0.xsd         |  8 +-
 v3_22_0/CDT-AEContactListPerCSE-v3_22_0.xsd   |  2 +-
 v3_22_0/CDT-CSEBase-v3_22_0.xsd               | 64 ++++++-------
 v3_22_0/CDT-accessControlPolicy-v3_22_0.xsd   |  6 +-
 v3_22_0/CDT-activeCmdhPolicy-v3_22_0.xsd      |  2 +-
 v3_22_0/CDT-allJoynApp-v3_22_0.xsd            |  8 +-
 v3_22_0/CDT-allJoynInterface-v3_22_0.xsd      | 12 +--
 v3_22_0/CDT-allJoynMethod-v3_22_0.xsd         |  8 +-
 v3_22_0/CDT-allJoynMethodCall-v3_22_0.xsd     |  6 +-
 v3_22_0/CDT-allJoynProperty-v3_22_0.xsd       |  6 +-
 v3_22_0/CDT-allJoynSvcObject-v3_22_0.xsd      |  8 +-
 v3_22_0/CDT-areaNwkDeviceInfo-v3_22_0.xsd     |  4 +-
 v3_22_0/CDT-areaNwkInfo-v3_22_0.xsd           |  4 +-
 v3_22_0/CDT-authorizationDecision-v3_22_0.xsd |  6 +-
 .../CDT-authorizationInformation-v3_22_0.xsd  | 10 +-
 v3_22_0/CDT-authorizationPolicy-v3_22_0.xsd   |  6 +-
 .../CDT-backgroundDataTransfer-v3_22_0.xsd    |  4 +-
 v3_22_0/CDT-battery-v3_22_0.xsd               |  4 +-
 v3_22_0/CDT-cmdhBuffer-v3_22_0.xsd            |  2 +-
 v3_22_0/CDT-cmdhDefEcValue-v3_22_0.xsd        |  2 +-
 v3_22_0/CDT-cmdhDefaults-v3_22_0.xsd          |  2 +-
 v3_22_0/CDT-cmdhEcDefParamValues-v3_22_0.xsd  |  2 +-
 v3_22_0/CDT-cmdhLimits-v3_22_0.xsd            |  2 +-
 .../CDT-cmdhNetworkAccessRules-v3_22_0.xsd    |  2 +-
 v3_22_0/CDT-cmdhNwAccessRule-v3_22_0.xsd      |  2 +-
 v3_22_0/CDT-cmdhPolicy-v3_22_0.xsd            |  2 +-
 v3_22_0/CDT-commonTypes-v3_22_0.xsd           |  2 +-
 v3_22_0/CDT-container-v3_22_0.xsd             | 12 +--
 v3_22_0/CDT-contentInstance-v3_22_0.xsd       |  6 +-
 .../CDT-crossResourceSubscription-v3_22_0.xsd |  8 +-
 v3_22_0/CDT-delivery-v3_22_0.xsd              |  4 +-
 v3_22_0/CDT-deviceCapability-v3_22_0.xsd      |  4 +-
 v3_22_0/CDT-deviceInfo-v3_22_0.xsd            |  4 +-
 ...namicAuthorizationConsultation-v3_22_0.xsd |  6 +-
 v3_22_0/CDT-eventConfig-v3_22_0.xsd           |  6 +-
 v3_22_0/CDT-eventLog-v3_22_0.xsd              |  4 +-
 v3_22_0/CDT-execInstance-v3_22_0.xsd          |  6 +-
 v3_22_0/CDT-firmware-v3_22_0.xsd              |  4 +-
 ...cInterworkingOperationInstance-v3_22_0.xsd |  6 +-
 ...CDT-genericInterworkingService-v3_22_0.xsd |  8 +-
 v3_22_0/CDT-group-v3_22_0.xsd                 |  8 +-
 v3_22_0/CDT-localMulticastGroup-v3_22_0.xsd   |  4 +-
 v3_22_0/CDT-locationPolicy-v3_22_0.xsd        |  6 +-
 ...-m2mServiceSubscriptionProfile-v3_22_0.xsd |  8 +-
 v3_22_0/CDT-memory-v3_22_0.xsd                |  4 +-
 v3_22_0/CDT-mgmtCmd-v3_22_0.xsd               |  8 +-
 v3_22_0/CDT-multimediaSession-v3_22_0.xsd     |  6 +-
 v3_22_0/CDT-node-v3_22_0.xsd                  | 34 +++----
 v3_22_0/CDT-notification-v3_22_0.xsd          |  4 +-
 ...otificationTargetMgmtPolicyRef-v3_22_0.xsd |  6 +-
 .../CDT-notificationTargetPolicy-v3_22_0.xsd  |  8 +-
 v3_22_0/CDT-ontology-v3_22_0.xsd              |  6 +-
 v3_22_0/CDT-ontologyRepository-v3_22_0.xsd    |  8 +-
 v3_22_0/CDT-policyDeletionRules-v3_22_0.xsd   |  6 +-
 v3_22_0/CDT-pollingChannel-v3_22_0.xsd        |  6 +-
 v3_22_0/CDT-reboot-v3_22_0.xsd                |  4 +-
 v3_22_0/CDT-remoteCSE-v3_22_0.xsd             | 32 +++----
 v3_22_0/CDT-request-v3_22_0.xsd               |  4 +-
 v3_22_0/CDT-requestPrimitive-v3_22_0.xsd      |  2 +-
 v3_22_0/CDT-responsePrimitive-v3_22_0.xsd     | 96 +++++++++----------
 v3_22_0/CDT-role-v3_22_0.xsd                  |  6 +-
 v3_22_0/CDT-schedule-v3_22_0.xsd              |  4 +-
 v3_22_0/CDT-semanticDescriptor-v3_22_0.xsd    |  6 +-
 .../CDT-semanticMashupInstance-v3_22_0.xsd    | 10 +-
 .../CDT-semanticMashupJobProfile-v3_22_0.xsd  | 10 +-
 v3_22_0/CDT-semanticMashupResult-v3_22_0.xsd  |  6 +-
 .../CDT-serviceSubscribedAppRule-v3_22_0.xsd  |  6 +-
 v3_22_0/CDT-serviceSubscribedNode-v3_22_0.xsd |  6 +-
 v3_22_0/CDT-software-v3_22_0.xsd              |  4 +-
 v3_22_0/CDT-statsCollect-v3_22_0.xsd          |  6 +-
 v3_22_0/CDT-statsConfig-v3_22_0.xsd           |  8 +-
 v3_22_0/CDT-subscription-v3_22_0.xsd          |  8 +-
 v3_22_0/CDT-svcFwWrapper-v3_22_0.xsd          |  6 +-
 v3_22_0/CDT-svcObjWrapper-v3_22_0.xsd         |  8 +-
 v3_22_0/CDT-timeSeries-v3_22_0.xsd            | 10 +-
 v3_22_0/CDT-timeSeriesInstance-v3_22_0.xsd    |  6 +-
 v3_22_0/CDT-token-v3_22_0.xsd                 |  6 +-
 v3_22_0/CDT-transaction-v3_22_0.xsd           |  6 +-
 v3_22_0/CDT-transactionMgmt-v3_22_0.xsd       |  6 +-
 v3_22_0/CDT-triggerPayload-v3_22_0.xsd        |  2 +-
 v3_22_0/CDT-triggerRequest-v3_22_0.xsd        |  6 +-
 82 files changed, 344 insertions(+), 344 deletions(-)

diff --git a/v3_22_0/CDT-AE-v3_22_0.xsd b/v3_22_0/CDT-AE-v3_22_0.xsd
index 0c10c1d..371fb53 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 5b7a250..1f09590 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 6e8ef45..7c20786 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 b588db6..0a00362 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 12b4345..0fed8ea 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 4f0a5fc..1b4c251 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 f54e637..9994cd4 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 17e2a9b..757bc1f 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 beb2f14..2ac5ca7 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 70ff112..0dd528f 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 5db1cf7..71928ab 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 37fa827..268536e 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 a36ab6c..bc68712 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 67cd30b..4bafbef 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 3a810e2..827cd29 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 d851f65..f103f34 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 b877a0d..950152c 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 1f091d6..2663845 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 1df31a5..25d1c8e 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 ac297dc..a0c7457 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 647a6e3..f87cdff 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 92e3dba..5c9a226 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 6819b6a..e96bf2c 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 b414a2d..00f4dca 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 3cf9a5f..2cf722d 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 a64b2d6..db23f74 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 8741660..ac884a0 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 4c967a2..e47485a 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 3e61f79..49ae83d 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 47b33a0..54bcb8c 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 eab2c54..4e8f37f 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 bcbd4f9..f5d25aa 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 82b82e6..6b404fd 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 859a044..69260e9 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 a1d4b3c..3bb9b27 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 70a3e6b..21b8f2b 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 f07cf22..a87c6d0 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 039d82c..aed0b6e 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 70f79ac..2162b1f 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 06fe6cf..9d62010 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 d881019..6d65bb1 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 8f25563..a12f291 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 eae277c..7d8e663 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 9565f04..fdf4875 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 d6cf645..30f5a8a 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 6b6d4c5..2da72ed 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 6374d5d..0256c0a 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 1665584..994e2a3 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 672c1cf..08bc712 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 7d07bfa..3c6d57f 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 9cff5b5..492c25a 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 96924f3..0aeb93d 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 424d562..9cc95e5 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 a1b13dc..6c71758 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 fd4aa55..0faf1e2 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 0a2dfd5..8966ccf 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 beb2cd0..8c0a5f3 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 be46a4b..952361e 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 64a9709..852207a 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 510ad3b..6f098f9 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 4e68292..5a40fd7 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 9d0b66f..b54270f 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 5223f3e..455a199 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 3371573..f06a0fb 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 6adbf5b..905590a 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 d01766c..a2fce82 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 fa8e324..fd286d7 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 3cac427..19cf73c 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 b218458..fda176e 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 cbc0876..3f9183d 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 26f8df4..552cdce 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 753a470..35fc4b3 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 c0b0106..92401a9 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 03e4af1..2193c6d 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 8f4ab89..7f26bff 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 fe42925..c739ff6 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 f633c58..2fb0824 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 e09c20d..08b4735 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 13765a7..b99a5ca 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 bca6499..be250d4 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 d954d6a..1249d1f 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 46e9706..de51f17 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>
-- 
GitLab