Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r316368374c18744558092bdf959a2fd6a4e5574b
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 316368374c18744558092bdf959a2fd6a4e5574b)
@@ -326,12 +326,15 @@
  *************************************************************************/
 void checkInletWaterConductivity( void )
 {
+    F32 conductivity      = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
+
+    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+    {
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
         DG_OP_MODE_T opMode   = getCurrentOperationMode();
-        F32 conductivity      = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
         BOOL isConductTooLow  = FALSE;
         BOOL isConductTooHigh = FALSE;
 
@@ -382,20 +385,26 @@
             case DG_MODE_CHEM:
             case DG_MODE_CHFL:
             case DG_MODE_ROPS:
-                if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-                {
-                    // Per PRS 403
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
-                    // Per PRS 404
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
-                }
+                // Per PRS 403
+                checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+                // Per PRS 404
+                checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
                 break;
 
             default:
                 // NOTE: Do nothing for the rest of the modes
                 break;
         }
     }
+    }
+    else
+    {
+        // VPI is closed - clear all alarms
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
+    }
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r316368374c18744558092bdf959a2fd6a4e5574b
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 316368374c18744558092bdf959a2fd6a4e5574b)
@@ -168,12 +168,15 @@
  *************************************************************************/
 void checkInletWaterPressure( void )
 {
+    F32 pressure           = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
+
+    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+    {
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
         DG_OP_MODE_T opMode    = getCurrentOperationMode();
-        F32 pressure           = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
         BOOL isPressureTooLow  = ( pressure < MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ? TRUE : FALSE );
         BOOL isPressureTooHigh = ( pressure > MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? TRUE : FALSE );
 
@@ -206,20 +209,26 @@
             case DG_MODE_CHEM:
             case DG_MODE_CHFL:
             case DG_MODE_ROPS:
-                if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-                {
-                    // TODO define the PRS
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
-                    // TODO define the PRS
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
-                }
+                // TODO define the PRS
+                checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+                // TODO define the PRS
+                checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
                 break;
 
             default:
                 // NOTE: Do nothing for the rest of the modes
                 break;
         }
     }
+    }
+    else
+    {
+        // VPI is closed - clear all alarms
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressure, MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, FALSE, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, FALSE, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
+    }
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r316368374c18744558092bdf959a2fd6a4e5574b
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 316368374c18744558092bdf959a2fd6a4e5574b)
@@ -413,14 +413,18 @@
  *************************************************************************/
 void checkInletWaterTemperature( void )
 {
+    F32 temperature             = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
+
+    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+    {
+
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
         if ( getTestConfigStatus( TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK ) != 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 );
 
@@ -455,15 +459,12 @@
                 case DG_MODE_CHEM:
                 case DG_MODE_CHFL:
                 case DG_MODE_ROPS:
-                    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 );
-                    }
+                    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:
@@ -472,6 +473,19 @@
             }
         }
     }
+    }
+    else
+    {
+        // VPI is closed - clear all alarms
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, FALSE, temperature,
+                              MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+    }
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r9d89d7a4b551f6f192d579db61b5a80d81c5efa0 -r316368374c18744558092bdf959a2fd6a4e5574b
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9d89d7a4b551f6f192d579db61b5a80d81c5efa0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 316368374c18744558092bdf959a2fd6a4e5574b)
@@ -206,20 +206,17 @@
     // Check inlet water conductivity, temperature, pressure, and RO rejection ratio
     BOOL status = FALSE;
 
-    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-    {
-        checkInletWaterConductivity();
-        checkInletWaterTemperature();
-        checkInletWaterPressure();
+    checkInletWaterConductivity();
+    checkInletWaterTemperature();
+    checkInletWaterPressure();
 
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE );
-    }
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE );
 
     return status;
 }