Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r6499ea25921fcf67826fa0c35bb03caf411ba542 -r5c430c3ac17fc8ad836fd70b8a3b8a12af44319e
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 6499ea25921fcf67826fa0c35bb03caf411ba542)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 5c430c3ac17fc8ad836fd70b8a3b8a12af44319e)
@@ -60,6 +60,7 @@
 #define SHIFT_BITS_BY_2                                         2U                                              ///< Shift bits by 2 to create a 4 for averaging 4 samples.
 #define SHIFT_BITS_BY_2_FOR_AVERAGING                           2U                                              ///< Shift the ADCs of the temperature sensors by 2 to average them.
 #define INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS                ( 5 * MS_PER_SECOND )                           ///< Inlet water temperature sensors timeout in milliseconds.
+#define INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS                  ( 1 * MS_PER_SECOND )                           ///< Inlet water temperature sensors out of range clear in milliseconds.
 
 #define MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE                 24.0F                                           ///< Low range minimum water input temperature.
 #define MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE                 26.0F                                           ///< Low range maximum water input temperature.
@@ -323,8 +324,8 @@
     tempSensors[ TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ].maxAllowedTemp        = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
     // Persistent alarms for inlet water high/low temperature
-    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE,  INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS );
     initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
 
@@ -434,10 +435,19 @@
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
-                isWaterTempInLowRange  = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
+                if ( ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) ) )
+                {
+                    isWaterTempInHighRange = FALSE;
+                }
+
                 // Per PRS 406
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature, MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+
+                if ( ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) ) )
+                {
+                    isWaterTempInLowRange = FALSE;
+                }
+
                 // Per PRS 405
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, isWaterTempInLowRange, temperature, MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
                 break;
@@ -447,6 +457,7 @@
             case DG_MODE_CHEM:
             case DG_MODE_INIT:
             case DG_MODE_STAN:
+            case DG_MODE_CHFL:
                 if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
                 {
                     // Per PRS 557