diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd
index 616a62819a4268abe2ac0e4d030ff869d6f06b76..c58e09f3f174e64e5ac20d520dc2040a88666fed 100644
--- a/DCFG-MAFClientRegCfg.xsd
+++ b/DCFG-MAFClientRegCfg.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd
index d8e7e46befbf13480fadd25dda77b7b74ce004f4..2b19256a7b697ac1091bc1b5b91118b6f53a8093 100644
--- a/DCFG-MEFClientRegCfg.xsd
+++ b/DCFG-MEFClientRegCfg.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-OAuth2.xsd b/DCFG-OAuth2.xsd
index 1fbc2aca84d393ede3ac9ddb5c1cf2c776764f41..af4e306ab9f8ed9c27fce23b93061748b1676f73 100644
--- a/DCFG-OAuth2.xsd
+++ b/DCFG-OAuth2.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd
index 129d6af4a10429855fc438dd5cf1d48939ee3378..e67e25e73fb3aa8245e31ead76b16f26f2cba146 100644
--- a/DCFG-authenticationProfile.xsd
+++ b/DCFG-authenticationProfile.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-commonTypes.xsd b/DCFG-commonTypes.xsd
index 27438b335d719facdaa5f9bdd824003f9d242df7..7b94c83b13e6c7a2af21aebbaa8bbc1bb4f2f7f8 100644
--- a/DCFG-commonTypes.xsd
+++ b/DCFG-commonTypes.xsd
@@ -23,8 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
 	<!-- <xs:include schemaLocation="CDT-enumerationTypes" />  -->
diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd
index 7ade30e46c20f3836b34831a8364904bfa983189..5ddb24fe342273e664666cde704b8bcd8bdd7027 100644
--- a/DCFG-dataCollection.xsd
+++ b/DCFG-dataCollection.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
diff --git a/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd
index 2416cdd7a29d1b89df70ee1200f5175de7e1d72d..7354fcfea0b6fd761412f83fee7e381980e5abe6 100644
--- a/DCFG-myCertFileCred.xsd
+++ b/DCFG-myCertFileCred.xsd
@@ -23,8 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/DCFG-registration.xsd b/DCFG-registration.xsd
index 69742104c11acc7a1f6842131a77107e9509413b..0bb2fb9983be22c77dc4d1e8404c4c2be8a17c46 100644
--- a/DCFG-registration.xsd
+++ b/DCFG-registration.xsd
@@ -23,8 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
 	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
@@ -45,6 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="appID" type="m2m:ID" minOccurs="0"/>					
 						<xs:element name="externalID" type="m2m:externalID" minOccurs="0"/>
 						<xs:element name="triggerRecipientID" type="m2m:triggerRecipientID" minOccurs="0"/>				
+						<xs:element name="M2M-Sub-ID" type="m2m:ID" minOccurs="0"/>
 						
 						<!-- Instantiations of this [registration] resource type shall include mgmntLink's to
 	                         the following children:
@@ -76,6 +77,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="appID" type="m2m:ID" minOccurs="0"/>					
 						<xs:element name="externalID" type="m2m:externalID" minOccurs="0"/>
 						<xs:element name="triggerRecipientID" type="m2m:triggerRecipientID" minOccurs="0"/>				
+						<xs:element name="M2M-Sub-ID" type="m2m:ID" minOccurs="0"/>
 						
 						<!-- Instantiations of this [registration] resource type shall include mgmntLink's to
 	                         the following children:
diff --git a/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd
index 848c7936220ac2eac0fd008bfcaec8727d945ced..e66edcf25ab8e29d202b74a37612e6b9c95d1a09 100644
--- a/DCFG-trustAnchorCred.xsd
+++ b/DCFG-trustAnchorCred.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-wifiClient.xsd b/DCFG-wifiClient.xsd
index 3c8cb4e14031353752939f4ef39b1371a87c699b..d7744c96b878aa418ef55d36e6d622a231387e45 100644
--- a/DCFG-wifiClient.xsd
+++ b/DCFG-wifiClient.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">