diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml
index a5b4130ad..23ff944ab 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aaag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b)
diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml
index 4f6594a04..6b912f19e 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_aliaag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b)
diff --git a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml
index 75424e58c..b8e76b049 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-mrb/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b)
diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml
index bc6462699..c1b2b73a3 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-up2-n3350/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b)
diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml
index 771c897de..be95ec885 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_aaag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b)
diff --git a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml
index c66b7d154..f6805ad05 100644
--- a/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/apl-up2/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
00:15.1 USB controller: Intel Corporation Device 5aaa (rev 0b)
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
index 6edfe17fa..fb889da31 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml
index 1f886afb1..962bfca4d 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_hardrt.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml
index 07d3b545b..ab8f076a1 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_vxworks.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml
index d215636a5..3241c6f56 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml
index 07b4d2f87..779efbbb7 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_2uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml
index e696d9d05..387ee2192 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry_launch_6uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
@@ -89,6 +97,10 @@
+ Disable
+
+
+
@@ -125,6 +137,10 @@
+ Disable
+
+
+
@@ -161,6 +177,10 @@
+ Disable
+
+
+
@@ -197,6 +217,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml
index ba1234bd0..fd4cfd2b9 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_zephyr.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_zephyr.xml
index c22483590..eb15bff06 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_zephyr.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc_launch_1uos_zephyr.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/generic/hybrid_launch_1uos.xml b/misc/vm_configs/xmls/config-xmls/generic/hybrid_launch_1uos.xml
index 1df10354d..e939cdf46 100644
--- a/misc/vm_configs/xmls/config-xmls/generic/hybrid_launch_1uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/generic/hybrid_launch_1uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/generic/industry_launch_1uos.xml b/misc/vm_configs/xmls/config-xmls/generic/industry_launch_1uos.xml
index 6c7a2ac0f..9b65928cf 100644
--- a/misc/vm_configs/xmls/config-xmls/generic/industry_launch_1uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/generic/industry_launch_1uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/generic/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/generic/industry_launch_2uos.xml
index e55a69f34..2ff04f3dc 100644
--- a/misc/vm_configs/xmls/config-xmls/generic/industry_launch_2uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/generic/industry_launch_2uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -51,6 +55,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/generic/sdc_launch_1uos.xml b/misc/vm_configs/xmls/config-xmls/generic/sdc_launch_1uos.xml
index 9ad2d29e6..72fc3a514 100644
--- a/misc/vm_configs/xmls/config-xmls/generic/sdc_launch_1uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/generic/sdc_launch_1uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml
index 4c4e0f97b..fb080ad6a 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_hardrt.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml
index b5acd00bd..48337a387 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_vxworks.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml
index fd1464051..df60af222 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml
index 2fa2ebf68..bc323c5c2 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_2uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -53,6 +57,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml
index fa1dd32eb..46f8bb8ca 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/industry_launch_6uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -53,6 +57,10 @@
+ Disable
+
+
+
@@ -91,6 +99,10 @@
+ Disable
+
+
+
@@ -127,6 +139,10 @@
+ Disable
+
+
+
@@ -163,6 +179,10 @@
+ Disable
+
+
+
@@ -199,6 +219,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml
index cdf64defd..17190406b 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml b/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml
index 95ec7425d..b5e7ea9ff 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc6cayh/sdc_launch_1uos_zephyr.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml
index 3cbe5aa53..5602e580b 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/hybrid_rt_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml
index 58448a49e..5ed329a14 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_hardrt.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml
index c96ed6085..f44b885e2 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_vxworks.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml
index c9a7e8aa4..1cfd453f7 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml
index 802c1f113..d5c239245 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_2uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml
index 1e1ecb9aa..aa9ae6d6c 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/industry_launch_6uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
@@ -89,6 +97,10 @@
+ Disable
+
+
+
@@ -125,6 +137,10 @@
+ Disable
+
+
+
@@ -161,6 +177,10 @@
+ Disable
+
+
+
@@ -197,6 +217,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml
index 01104981b..43070ed87 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml
index ca5f6aba7..a769e3578 100644
--- a/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml
+++ b/misc/vm_configs/xmls/config-xmls/nuc7i7dnb/sdc_launch_1uos_zephyr.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml b/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml
index 7478ccbdf..13268fc4c 100644
--- a/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml
+++ b/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_RT_VM.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml b/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml
index 04925a197..c522901c9 100644
--- a/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml
+++ b/misc/vm_configs/xmls/config-xmls/template/LAUNCH_POST_STD_VM.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
index ee843682c..77f252259 100644
--- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/hybrid_rt_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml
index bc65125e5..60bbeac4d 100644
--- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_2uos.xml
index 0ee5fc048..3bab1c334 100644
--- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_2uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/industry_launch_2uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_laag.xml
index f37f8140b..fee1fabb4 100644
--- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_zephyr.xml b/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_zephyr.xml
index bb75448ea..5a8ac07d6 100644
--- a/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_zephyr.xml
+++ b/misc/vm_configs/xmls/config-xmls/tgl-rvp/sdc_launch_1uos_zephyr.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
index 291917e31..8466a6963 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml
index 0602e9a72..7cbba2350 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_hardrt.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml
index 94114b6b6..acca49478 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_vxworks.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml
index ccbfc155a..2f99b8bfb 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml
index d95596f97..d6dddbbb0 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_2uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml
index 42f6eb69f..2de987b3f 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/industry_launch_6uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
@@ -89,6 +97,10 @@
+ Disable
+
+
+
@@ -125,6 +137,10 @@
+ Disable
+
+
+
@@ -161,6 +177,10 @@
+ Disable
+
+
+
@@ -197,6 +217,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml
index d708e420b..d684b0eba 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_laag.xml
@@ -14,6 +14,11 @@
+
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
index 687d99816..47728c454 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
@@ -14,6 +14,11 @@
+
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml
index aef9617f3..f13ea30dd 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/hybrid_rt_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml
index 384e0ce9d..21b9edf4e 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_hardrt.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml
index cf9763be1..32946990e 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_vxworks.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml
index 2f67bb227..23b6dc552 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_1uos_waag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml
index 5c0c33524..6ddc0ad76 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_2uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml
index ed49fe60e..36073860b 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/industry_launch_6uos.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
@@ -52,6 +56,10 @@
+ Disable
+
+
+
@@ -89,6 +97,10 @@
+ Disable
+
+
+
@@ -125,6 +137,10 @@
+ Disable
+
+
+
@@ -161,6 +177,10 @@
+ Disable
+
+
+
@@ -197,6 +217,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml
index 3fb1bbd67..9c8f6dff4 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_laag.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+
diff --git a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml
index f60416224..9c3b60776 100644
--- a/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml
+++ b/misc/vm_configs/xmls/config-xmls/whl-ipc-i7/sdc_launch_1uos_zephyr.xml
@@ -14,6 +14,10 @@
+ Disable
+
+
+