Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r667feab319b14681a0330a715da7a1ba930b518d -r2a3a47ca90ad19851a30c52f6999a56d5f578783
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
@@ -10,6 +10,7 @@
 #include "MessageSupport.h"
 #include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Reservoirs.h"
 #include "TaskGeneral.h"
@@ -241,9 +242,12 @@
     // Check if the time that the reservoir has been use has exceeded the limit
     if ( TRUE == didTimeout( timeReservoirInUseMS, MAX_RESERVOIR_DEPLETION_TIME_MS ) )
     {
-#ifndef SKIP_RESERVOIR_ALARMS
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT, calcTimeSince( timeReservoirInUseMS ) )
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RESERVOIRS_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT, calcTimeSince( timeReservoirInUseMS ) )
+        }
     }
 }
 
@@ -549,9 +553,13 @@
     // diluted to much
     if ( recirculationLevelPct >= MAX_RESERVOIR_RECIRCULATION )
     {
-#ifndef SKIP_RESERVOIR_ALARMS
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE, recirculationLevelPct )
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RESERVOIRS_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE, recirculationLevelPct )
+        }
+
     }
 
     // Check if DG has moved out of the fill mode