Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r4c7ef2a9a07569d02844f58b74c4fbdc96a06999 -r1450a360a3a6067b52cea21169c09ff31274024a
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4c7ef2a9a07569d02844f58b74c4fbdc96a06999)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1450a360a3a6067b52cea21169c09ff31274024a)
@@ -21,7 +21,9 @@
 #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"
@@ -125,6 +127,11 @@
 
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
 
+#ifndef _RELEASE_
+    setHeatNelsonSupportMode( NELSON_NONE );
+    setChemNelsonSupportMode( NELSON_NONE );
+#endif
+
     return standbyState;
 }
 
@@ -487,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;