Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rc7ea3969643ead419cbfcd34c3cb203c45bcad71 -ree022a0592bc2544ed177f8b80959555d690ae02
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision c7ea3969643ead419cbfcd34c3cb203c45bcad71)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision ee022a0592bc2544ed177f8b80959555d690ae02)
@@ -418,51 +418,58 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        DG_OP_MODE_T opMode         = getCurrentOperationMode();
-        F32 temperature             = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
-        BOOL isWaterTempInHighRange = ( temperature > MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
-        BOOL isWaterTempInLowRange  = ( temperature < MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ? TRUE : FALSE );
-
-        switch( opMode )
+        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK ) != TRUE )
         {
-            case DG_MODE_GENE:
-            case DG_MODE_FILL:
-            case DG_MODE_DRAI:
-            case DG_MODE_STAN:
-                if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )
-                {
-                    isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
-                }
+            DG_OP_MODE_T opMode         = getCurrentOperationMode();
+            F32 temperature             = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
+            BOOL isWaterTempInHighRange = ( temperature > MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
+            BOOL isWaterTempInLowRange  = ( temperature < MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ? TRUE : FALSE );
 
-                // Per PRS 406
-                checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature, MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+            switch( opMode )
+            {
+                case DG_MODE_GENE:
+                case DG_MODE_FILL:
+                case DG_MODE_DRAI:
+                case DG_MODE_STAN:
+                    if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )
+                    {
+                        isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
+                    }
 
-                if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )
-                {
-                    isWaterTempInLowRange = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
-                }
+                    // Per PRS 406
+                    checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature,
+                                          MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
 
-                // Per PRS 405
-                checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, isWaterTempInLowRange, temperature, MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
-                break;
+                    if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )
+                    {
+                        isWaterTempInLowRange = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
+                    }
 
-            case DG_MODE_FLUS:
-            case DG_MODE_HEAT:
-            case DG_MODE_HCOL:
-            case DG_MODE_CHEM:
-            case DG_MODE_CHFL:
-                if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-                {
-                    isWaterTempInHighRange = ( temperature > MAX_CLEANING_MODE_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
-                    // Per PRS 557
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, isWaterTempInHighRange, temperature, MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, isWaterTempInLowRange, temperature, MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
-                }
-                break;
+                    // Per PRS 405
+                    checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, isWaterTempInLowRange, temperature,
+                                          MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+                    break;
 
-            default:
-                // NOTE: Do nothing in the rest of the modes
-                break;
+                case DG_MODE_FLUS:
+                case DG_MODE_HEAT:
+                case DG_MODE_HCOL:
+                case DG_MODE_CHEM:
+                case DG_MODE_CHFL:
+                    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+                    {
+                        isWaterTempInHighRange = ( temperature > MAX_CLEANING_MODE_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
+                        // Per PRS 557
+                        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, isWaterTempInHighRange, temperature,
+                                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+                        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, isWaterTempInLowRange, temperature,
+                                              MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+                    }
+                    break;
+
+                default:
+                    // NOTE: Do nothing in the rest of the modes
+                    break;
+            }
         }
     }
 }