Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r66cc826068b54bc436cde0fae70a05ba6c1ac974 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 66cc826068b54bc436cde0fae70a05ba6c1ac974)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -379,39 +379,42 @@
         flowFilterCounter       = 0;
     }
 
-#ifndef IGNORE_RO_PUMP_MONITOR
-    // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V
-    // The duty cycle is calculated by getting the 1 - (ratio of feedback / to the voltage at 0 percent duty cycle).
-    roPumpFeedbackDutyCyclePct =  1.0 - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
-
-    // To monitor the flow, the control mode must be in closed loop mode and the pump should be control to flow state
-    // If the pump is controlled to the maximum pressure, the flow might be different from the target flow for more than 10%
-    // but the pump is not able to achieve the flow.
-    if ( ( PUMP_CONTROL_MODE_CLOSED_LOOP == roPumpControlMode ) && ( RO_PUMP_CONTROL_TO_TARGET_FLOW_STATE == roPumpState ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RO_PUMP_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        F32 currentFlow = getMeasuredROFlowRateLPM();
-        F32 targetFlow  = getTargetROPumpFlowRate();
-        // The flow cannot be out of range for than 10% of the target flow
-        BOOL isFlowOutOfRange = ( fabs( 1.0 - ( currentFlow / targetFlow ) ) > MAX_ALLOWED_FLOW_DEVIATION ? TRUE : FALSE );
-        // Figure out whether flow is out of range from which side
-        BOOL isFlowOutOfUpperRange = ( isFlowOutOfRange && ( currentFlow > targetFlow ) ? TRUE : FALSE );
-        BOOL isFlowOutOfLowerRange = ( isFlowOutOfRange && ( currentFlow < targetFlow ) ? TRUE : FALSE );
+        // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V
+        // The duty cycle is calculated by getting the 1 - (ratio of feedback / to the voltage at 0 percent duty cycle).
+        roPumpFeedbackDutyCyclePct =  1.0 - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
 
-        checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, isFlowOutOfUpperRange, currentFlow, targetFlow );
-        checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow );
-    }
+        // To monitor the flow, the control mode must be in closed loop mode and the pump should be control to flow state
+        // If the pump is controlled to the maximum pressure, the flow might be different from the target flow for more than 10%
+        // but the pump is not able to achieve the flow.
+        if ( ( PUMP_CONTROL_MODE_CLOSED_LOOP == roPumpControlMode ) && ( RO_PUMP_CONTROL_TO_TARGET_FLOW_STATE == roPumpState ) )
+        {
+            F32 currentFlow = getMeasuredROFlowRateLPM();
+            F32 targetFlow  = getTargetROPumpFlowRate();
+            // The flow cannot be out of range for than 10% of the target flow
+            BOOL isFlowOutOfRange = ( fabs( 1.0 - ( currentFlow / targetFlow ) ) > MAX_ALLOWED_FLOW_DEVIATION ? TRUE : FALSE );
+            // Figure out whether flow is out of range from which side
+            BOOL isFlowOutOfUpperRange = ( isFlowOutOfRange && ( currentFlow > targetFlow ) ? TRUE : FALSE );
+            BOOL isFlowOutOfLowerRange = ( isFlowOutOfRange && ( currentFlow < targetFlow ) ? TRUE : FALSE );
 
-    // Check whether the Duty cycle is out of range
-    BOOL isDCOutOfRange = ( fabs( roPumpFeedbackDutyCyclePct - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
+            checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, isFlowOutOfUpperRange, currentFlow, targetFlow );
+            checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow );
+        }
 
-    checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, isDCOutOfRange, roPumpFeedbackDutyCyclePct, roPumpDutyCyclePctSet );
+        // Check whether the Duty cycle is out of range
+        BOOL isDCOutOfRange = ( fabs( roPumpFeedbackDutyCyclePct - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
 
-    // Check if it the alarm has timed out and if the pump is supposed to be off but it is still on, activate the safety shutdown
-    if ( ( TRUE == isAlarmActive( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE ) ) && ( FALSE == isROPumpOn ) )
-    {
-        activateSafetyShutdown();
+        checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, isDCOutOfRange, roPumpFeedbackDutyCyclePct, roPumpDutyCyclePctSet );
+
+        // Check if it the alarm has timed out and if the pump is supposed to be off but it is still on, activate the safety shutdown
+        if ( ( TRUE == isAlarmActive( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE ) ) && ( FALSE == isROPumpOn ) )
+        {
+            activateSafetyShutdown();
+        }
     }
-#endif
 
     // Publish RO pump data on interval
     publishROPumpData();