Index: firmware/App/Monitors/WaterQualityMonitor.c
===================================================================
diff -u -r376dfac415321b3d85405e5ef16c48f2118f0f20 -rb576eac158a7bcffd16012dcd5d737e7df4f61d9
--- firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 376dfac415321b3d85405e5ef16c48f2118f0f20)
+++ firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision b576eac158a7bcffd16012dcd5d737e7df4f61d9)
@@ -67,9 +67,7 @@
 #define MIN_RO_REJECTION_RATIO_PCT                                   90.0F                                                   ///< Minimum RO rejection ration in percentage
 
 #define PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS               ( 5 * MS_PER_SECOND )                                   ///< Verify Water timer ( in ms )
-#define PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_CLEAR_MS                 ( 5 * MS_PER_SECOND )                                   ///< Verify Water timer ( in ms )
 #define PERMEATE_FLOW_FAULT_MIN_THRESHOLD                            200.0F                                                  ///< Permeate flow low tolerance limit
-#define PERMEATE_FLOW_LOW_OUT_OF_RANGE_EXEMPT_MS                     ( 5 * MS_PER_SECOND )                                   ///< Permeate flow low alarm exempt for 10 seconds after starting from Off (5 seconds is considered in persistence)
 
 #define RO_PUMP_DUTY_CYCLE_WARNING_TIMEOUT_MS                        ( 1 * MS_PER_SECOND )                                   ///< Persistence period for duty cycle in warning range in milliseconds.
 #define RO_PUMP_DUTY_CYCLE_WARNING_CLEAR_MS                          ( 1 * MS_PER_SECOND )                                   ///< Persistence period for duty cycle warning range clear in milliseconds.
@@ -111,10 +109,9 @@
     initPersistentAlarm( ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE, INLET_WATER_COND_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, INLET_WATER_COND_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_OUT_OF_RANGE_TIMEOUT_MS );
 
-    //Flow Alarms
-    initPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_CLEAR_MS, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS );
-    // fault , clearing timeout is not applicable
-    initPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_CLEAR_MS, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS );
+    //Flow Alarms. Clearing timeout is not applicable for Fault alarms
+    initPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE, 0, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, 0, PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS );
 
     // duty cycle warning alarm
     initPersistentAlarm( ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE, RO_PUMP_DUTY_CYCLE_WARNING_CLEAR_MS, RO_PUMP_DUTY_CYCLE_WARNING_TIMEOUT_MS );
@@ -198,10 +195,13 @@
     BOOL isFlowOutOfRange = FALSE;
     F32 minimumAllowedPermeateFlow = (F32)getTargetROPumpFlowRateMLPM() - PERMEATE_FLOW_FAULT_MIN_THRESHOLD;
 
-    if ( TRUE == getROPumpLowFlowExemptFlag() && didTimeout( getROPumpLowFlowExemptTimer(), PERMEATE_FLOW_LOW_OUT_OF_RANGE_EXEMPT_MS ) )
+    isFlowOutOfRange = ( ( permeateFlow < minimumAllowedPermeateFlow ) ? TRUE : FALSE );
+    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, isFlowOutOfRange ) )
     {
-        isFlowOutOfRange = ( ( permeateFlow < minimumAllowedPermeateFlow ) ? TRUE : FALSE );
-        checkPersistentAlarm( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, isFlowOutOfRange, permeateFlow, minimumAllowedPermeateFlow );
+        if ( exemptROPumpLowFlowAlarm() != TRUE )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE, permeateFlow, minimumAllowedPermeateFlow );
+        }
     }
 }