diff --git a/Source-arm/BSP/CustomRpi2/OEMInputSamples/RetailOEMInput.xml b/Source-arm/BSP/CustomRpi2/OEMInputSamples/RetailOEMInput.xml
index ff16eaab..ef91667a 100644
--- a/Source-arm/BSP/CustomRpi2/OEMInputSamples/RetailOEMInput.xml
+++ b/Source-arm/BSP/CustomRpi2/OEMInputSamples/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD_MBR</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
diff --git a/Source-arm/BSP/QCDB410C/OEMInputSamples/RetailOEMInput.xml b/Source-arm/BSP/QCDB410C/OEMInputSamples/RetailOEMInput.xml
index 0b927b17..05556930 100644
--- a/Source-arm/BSP/QCDB410C/OEMInputSamples/RetailOEMInput.xml
+++ b/Source-arm/BSP/QCDB410C/OEMInputSamples/RetailOEMInput.xml
@@ -41,6 +41,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>
       <Feature>IOT_UAP_OOBE</Feature>
       <!-- Sample Apps, remove this when you introduce OEM Apps -->
       <Feature>IOT_BERTHA</Feature>
diff --git a/Source-arm/BSP/Rpi2/OEMInputSamples/RetailOEMInput.xml b/Source-arm/BSP/Rpi2/OEMInputSamples/RetailOEMInput.xml
index a5dbbd07..4d7db04a 100644
--- a/Source-arm/BSP/Rpi2/OEMInputSamples/RetailOEMInput.xml
+++ b/Source-arm/BSP/Rpi2/OEMInputSamples/RetailOEMInput.xml
@@ -40,6 +40,7 @@
       <Feature>IOT_EFIESP_BCD_MBR</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
diff --git a/Source-arm/Products/DigitalSign/RetailOEMInput.xml b/Source-arm/Products/DigitalSign/RetailOEMInput.xml
index d25e0fad..b5c1c215 100644
--- a/Source-arm/Products/DigitalSign/RetailOEMInput.xml
+++ b/Source-arm/Products/DigitalSign/RetailOEMInput.xml
@@ -58,6 +58,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>
       <Feature>IOT_POWER_SETTINGS</Feature>
       <Feature>IOT_USBFN_CLASS_EXTENSION</Feature>
 
diff --git a/Source-arm/Products/MultiLangSample/RetailOEMInput.xml b/Source-arm/Products/MultiLangSample/RetailOEMInput.xml
index 0ef507e2..d4b815e6 100644
--- a/Source-arm/Products/MultiLangSample/RetailOEMInput.xml
+++ b/Source-arm/Products/MultiLangSample/RetailOEMInput.xml
@@ -55,6 +55,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
diff --git a/Source-arm/Products/RPiRecovery/RetailOEMInput.xml b/Source-arm/Products/RPiRecovery/RetailOEMInput.xml
index 220afe45..f08ef381 100644
--- a/Source-arm/Products/RPiRecovery/RetailOEMInput.xml
+++ b/Source-arm/Products/RPiRecovery/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD_MBR</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
diff --git a/Source-arm/Products/RecoverySample/RetailOEMInput.xml b/Source-arm/Products/RecoverySample/RetailOEMInput.xml
index 813500da..4b0420f6 100644
--- a/Source-arm/Products/RecoverySample/RetailOEMInput.xml
+++ b/Source-arm/Products/RecoverySample/RetailOEMInput.xml
@@ -41,6 +41,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_UAP_OOBE</Feature>
       <!-- Sample Apps, remove this when you introduce OEM Apps -->
       <Feature>IOT_BERTHA</Feature>
diff --git a/Source-arm/Products/SampleA/RetailOEMInput.xml b/Source-arm/Products/SampleA/RetailOEMInput.xml
index d8698ebd..b548d58f 100644
--- a/Source-arm/Products/SampleA/RetailOEMInput.xml
+++ b/Source-arm/Products/SampleA/RetailOEMInput.xml
@@ -40,6 +40,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
diff --git a/Source-arm/Products/SampleB/RetailOEMInput.xml b/Source-arm/Products/SampleB/RetailOEMInput.xml
index 99fbc043..bd094a94 100644
--- a/Source-arm/Products/SampleB/RetailOEMInput.xml
+++ b/Source-arm/Products/SampleB/RetailOEMInput.xml
@@ -40,6 +40,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
diff --git a/Source-arm/Products/SecureSample/RetailOEMInput.xml b/Source-arm/Products/SecureSample/RetailOEMInput.xml
index 57a85e3d..604116e1 100644
--- a/Source-arm/Products/SecureSample/RetailOEMInput.xml
+++ b/Source-arm/Products/SecureSample/RetailOEMInput.xml
@@ -41,6 +41,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_UAP_OOBE</Feature>
       <!-- Sample Apps, remove this when you introduce OEM Apps -->
       <Feature>IOT_BERTHA</Feature>
diff --git a/Source-arm/Products/SingleLangSample/RetailOEMInput.xml b/Source-arm/Products/SingleLangSample/RetailOEMInput.xml
index 03f5660d..94aee8b0 100644
--- a/Source-arm/Products/SingleLangSample/RetailOEMInput.xml
+++ b/Source-arm/Products/SingleLangSample/RetailOEMInput.xml
@@ -41,6 +41,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
diff --git a/Source-x64/BSP/CustomMBMx64/OEMInputSamples/RetailOEMInput.xml b/Source-x64/BSP/CustomMBMx64/OEMInputSamples/RetailOEMInput.xml
index e01bad3a..f4b91226 100644
--- a/Source-x64/BSP/CustomMBMx64/OEMInputSamples/RetailOEMInput.xml
+++ b/Source-x64/BSP/CustomMBMx64/OEMInputSamples/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x64/BSP/MBMx64/OEMInputSamples/RetailOEMInput.xml b/Source-x64/BSP/MBMx64/OEMInputSamples/RetailOEMInput.xml
index 66d6d75a..57dc9def 100644
--- a/Source-x64/BSP/MBMx64/OEMInputSamples/RetailOEMInput.xml
+++ b/Source-x64/BSP/MBMx64/OEMInputSamples/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x64/Products/MultiLangSample/RetailOEMInput.xml b/Source-x64/Products/MultiLangSample/RetailOEMInput.xml
index a0781383..5b341e63 100644
--- a/Source-x64/Products/MultiLangSample/RetailOEMInput.xml
+++ b/Source-x64/Products/MultiLangSample/RetailOEMInput.xml
@@ -55,6 +55,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x64/Products/SampleA/RetailOEMInput.xml b/Source-x64/Products/SampleA/RetailOEMInput.xml
index e807c3c6..bb6d75db 100644
--- a/Source-x64/Products/SampleA/RetailOEMInput.xml
+++ b/Source-x64/Products/SampleA/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
 
       <!-- Following two required for Appx Installation -->
diff --git a/Source-x64/Products/SampleB/RetailOEMInput.xml b/Source-x64/Products/SampleB/RetailOEMInput.xml
index ce105f7c..1f672ae5 100644
--- a/Source-x64/Products/SampleB/RetailOEMInput.xml
+++ b/Source-x64/Products/SampleB/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x64/Products/SingleLangSample/RetailOEMInput.xml b/Source-x64/Products/SingleLangSample/RetailOEMInput.xml
index a24d21f2..838600ed 100644
--- a/Source-x64/Products/SingleLangSample/RetailOEMInput.xml
+++ b/Source-x64/Products/SingleLangSample/RetailOEMInput.xml
@@ -41,6 +41,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x86/BSP/CustomMBM/OEMInputSamples/RetailOEMInput.xml b/Source-x86/BSP/CustomMBM/OEMInputSamples/RetailOEMInput.xml
index 8dfe985c..19c60e5d 100644
--- a/Source-x86/BSP/CustomMBM/OEMInputSamples/RetailOEMInput.xml
+++ b/Source-x86/BSP/CustomMBM/OEMInputSamples/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x86/BSP/MBM/OEMInputSamples/RetailOEMInput.xml b/Source-x86/BSP/MBM/OEMInputSamples/RetailOEMInput.xml
index f146330c..0c94ec24 100644
--- a/Source-x86/BSP/MBM/OEMInputSamples/RetailOEMInput.xml
+++ b/Source-x86/BSP/MBM/OEMInputSamples/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x86/Products/MultiLangSample/RetailOEMInput.xml b/Source-x86/Products/MultiLangSample/RetailOEMInput.xml
index 4ec1ec73..d962b693 100644
--- a/Source-x86/Products/MultiLangSample/RetailOEMInput.xml
+++ b/Source-x86/Products/MultiLangSample/RetailOEMInput.xml
@@ -55,6 +55,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x86/Products/SampleA/RetailOEMInput.xml b/Source-x86/Products/SampleA/RetailOEMInput.xml
index 9afe43c0..050a8620 100644
--- a/Source-x86/Products/SampleA/RetailOEMInput.xml
+++ b/Source-x86/Products/SampleA/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
 
       <!-- Following two required for Appx Installation -->
diff --git a/Source-x86/Products/SampleB/RetailOEMInput.xml b/Source-x86/Products/SampleB/RetailOEMInput.xml
index e23c2d97..4e1cabc4 100644
--- a/Source-x86/Products/SampleB/RetailOEMInput.xml
+++ b/Source-x86/Products/SampleB/RetailOEMInput.xml
@@ -38,6 +38,7 @@
       <Feature>IOT_EFIESP_BCD</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
diff --git a/Source-x86/Products/SingleLangSample/RetailOEMInput.xml b/Source-x86/Products/SingleLangSample/RetailOEMInput.xml
index c7bc3b63..cb5a197c 100644
--- a/Source-x86/Products/SingleLangSample/RetailOEMInput.xml
+++ b/Source-x86/Products/SingleLangSample/RetailOEMInput.xml
@@ -41,6 +41,7 @@
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
       <Feature>IOT_GENERIC_POP</Feature>
+      <Feature>IOT_CRT140</Feature>      
       <Feature>IOT_POWER_SETTINGS</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>