diff --git a/emBODY/eBcode/arch-arm/board/ems004/appl/v2/proj/ems4rd.diagnostic2ready.uvoptx b/emBODY/eBcode/arch-arm/board/ems004/appl/v2/proj/ems4rd.diagnostic2ready.uvoptx
index cc14f556b9..512effd3ca 100644
--- a/emBODY/eBcode/arch-arm/board/ems004/appl/v2/proj/ems4rd.diagnostic2ready.uvoptx
+++ b/emBODY/eBcode/arch-arm/board/ems004/appl/v2/proj/ems4rd.diagnostic2ready.uvoptx
@@ -2586,7 +2586,7 @@
 
   <Group>
     <GroupName>appl-services</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
diff --git a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/hal.stm32f4.uvoptx b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/hal.stm32f4.uvoptx
index 6b339c51a3..69391e0b97 100644
--- a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/hal.stm32f4.uvoptx
+++ b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/hal.stm32f4.uvoptx
@@ -357,7 +357,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -1349,7 +1349,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -2208,7 +2208,7 @@
 
   <Group>
     <GroupName>hal-extra-periphs</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
diff --git a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.ethdbg.lib b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.ethdbg.lib
index 8b592ee746..6512bb66e4 100644
Binary files a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.ethdbg.lib and b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.ethdbg.lib differ
diff --git a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.lib b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.lib
index 220280a343..614a4f50c7 100644
Binary files a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.lib and b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.lib differ
diff --git a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc2plus.ethdbg.lib b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc2plus.ethdbg.lib
index 19a79ae2ff..e160f2887c 100644
Binary files a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc2plus.ethdbg.lib and b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc2plus.ethdbg.lib differ
diff --git a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.ethdbg.lib b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.ethdbg.lib
index 1512561754..7d9a827e4f 100644
Binary files a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.ethdbg.lib and b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.ethdbg.lib differ
diff --git a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.lib b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.lib
index ae3f7b0608..1e0f609c34 100644
Binary files a/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.lib and b/emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.lib differ