Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -336,40 +336,43 @@
         drainPumpMeasuredRPM.data = CONVERSION_COEFF / getFPGADrainPumpSpeed();
     }
 
-#ifndef IGNORE_DRAIN_PUMP_MONITOR
-    // Check if the pump is in off state and the RPM is greater than the minimum RPM
-    if ( DRAIN_PUMP_OFF_STATE == drainPumpState )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        BOOL isRPMTooHigh = ( getDrainPumpMeasuredRPM() > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
+        // Check if the pump is in off state and the RPM is greater than the minimum RPM
+        if ( DRAIN_PUMP_OFF_STATE == drainPumpState )
+        {
+            BOOL isRPMTooHigh = ( getDrainPumpMeasuredRPM() > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
 
-        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
-        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
 
-        // If the off fault alarm has become active, trigger the safety shutdown
-        if ( TRUE == isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )
-        {
-            activateSafetyShutdown();
+            // If the off fault alarm has become active, trigger the safety shutdown
+            if ( TRUE == isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )
+            {
+                activateSafetyShutdown();
+            }
         }
-    }
-    // The RPM is only checked in open loop state that the pump is run at a fixed RPM.
-    else if ( DRAIN_PUMP_OPEN_LOOP_STATE == drainPumpState )
-    {
-        // Using abs since the read RPM can be above or below the target
-        U32 rpmDiff = abs( getDrainPumpTargetRPM() - getDrainPumpMeasuredRPM() );
+        // The RPM is only checked in open loop state that the pump is run at a fixed RPM.
+        else if ( DRAIN_PUMP_OPEN_LOOP_STATE == drainPumpState )
+        {
+            // Using abs since the read RPM can be above or below the target
+            U32 rpmDiff = abs( getDrainPumpTargetRPM() - getDrainPumpMeasuredRPM() );
 
-        // Check if RPM is out of range
-        BOOL isRPMOutOfRange = ( rpmDiff > MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE ? TRUE : FALSE );
+            // Check if RPM is out of range
+            BOOL isRPMOutOfRange = ( rpmDiff > MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE ? TRUE : FALSE );
 
-        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
-        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
+        }
+        else
+        {
+            // There are not out of range conditions, clear the alarms
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
+        }
     }
-    else
-    {
-        // There are not out of range conditions, clear the alarms
-        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
-        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
-    }
-#endif
 
     // Publish drain pump data on interval
     publishDrainPumpData();