Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r1450a360a3a6067b52cea21169c09ff31274024a
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1450a360a3a6067b52cea21169c09ff31274024a)
@@ -8,19 +8,22 @@
 * @file    ModeStandby.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      18-Jan-2023
+* @date    (last)      21-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
 #include "ConcentratePumps.h"
+#include "ConductivitySensors.h"
 #include "CPLD.h"
 #include "DrainPump.h"
 #include "Heaters.h"
 #include "MessageSupport.h"
+#include "ModeChemicalDisinfect.h"
 #include "ModeFault.h"
+#include "ModeHeatDisinfect.h"
 #include "ModeStandby.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -124,6 +127,11 @@
 
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
 
+#ifndef _RELEASE_
+    setHeatNelsonSupportMode( NELSON_NONE );
+    setChemNelsonSupportMode( NELSON_NONE );
+#endif
+
     return standbyState;
 }
 
@@ -136,6 +144,10 @@
  *************************************************************************/
 U32 execStandbyMode( void )
 {
+    checkInletWaterPressure();
+    checkInletWaterTemperature();
+    checkInletWaterConductivity();
+
     // execute current Standby state
     switch ( standbyState )
     {
@@ -244,8 +256,6 @@
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
     U32 filterFlushTimePeriod_ms  = getU32OverrideValue( &filterFlushTimePeriod );
 
-    checkInletWaterPressure();
-
     if ( TRUE == didTimeout( filterFlushStartTime, filterFlushTimePeriod_ms ) )
     {
         setValveState( VPI, VALVE_STATE_CLOSED );
@@ -484,7 +494,7 @@
     BOOL status = FALSE;
 
     // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect
-    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
+    if ( ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
     {
         DG_CMD_RESPONSE_T cmdResponse;
         DG_USAGE_INFO_RECORD_T usageInfo;