Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r16b02389432724c1bd15e9ce58579bff95050a03 -r4d0c621f5994e1de8bf7d3337678f7835292ce73
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 16b02389432724c1bd15e9ce58579bff95050a03)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 4d0c621f5994e1de8bf7d3337678f7835292ce73)
@@ -8,16 +8,16 @@
 * @file    BloodLeak.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Jul-2023
+* @date    (last)      16-Aug-2023
 *
 * @author  (original)  Peman Montazemi
 * @date    (original)  18-Mar-2021
 *
 ***************************************************************************/
 
-#include <string.h> // For sprintf and strlen
-#include <math.h>
-#include <stdio.h> // For sprintf
+#include <math.h>   // For pow function
+#include <string.h> // For memset and strlen
+#include <stdio.h>  // For sprintf
 
 #include "AlarmMgmt.h"
 #include "BloodLeak.h"
@@ -647,6 +647,7 @@
             bloodLeakSelfTestStatus = SELF_TEST_STATUS_FAILED;
             state                   = BLOOD_LEAK_INIT_STATE;
         }
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, bloodLeakSelfTestStatus, state );
     }
 
     return state;
@@ -686,15 +687,13 @@
                     if ( ++bloodLeakPersistenceCtr > BLOOD_LEAK_PERSISTENCE )
                     {
                         bloodLeakPersistenceCtr = BLOOD_LEAK_PERSISTENCE;
-#ifndef _RELEASE_
-                         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-                         {
-                             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_DETECTED );
-                             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT );
-                             bloodLeakRecoveryStartTimeMS = getMSTimerCount();
-                             state                        = BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE;
-                         }
+                        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != TRUE )
+                        {
+                            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_DETECTED );
+                            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT );
+                            bloodLeakRecoveryStartTimeMS = getMSTimerCount();
+                            state                        = BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE;
+                        }
                     }
                 }
                 else if ( bloodLeakPersistenceCtr > 0 )