Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -re608f0a2bda2ad8df59a604a511cbd2a1c323dc3 -r86a4c29675dc34118aa9d4b55ead1d710a45ec10
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e608f0a2bda2ad8df59a604a511cbd2a1c323dc3)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 86a4c29675dc34118aa9d4b55ead1d710a45ec10)
@@ -25,7 +25,6 @@
 #include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFault.h"
-#include "ModeHeatDisinfect.h"
 #include "ModeStandby.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -775,7 +774,7 @@
 
 #ifndef _RELEASE_
     if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) != SW_CONFIG_ENABLE_VALUE ) &&
-         ( nelsonSupport != NELSON_POS_CONTROL_CHEM_DISINFECT ) )
+         ( ( nelsonSupport != NELSON_POS_CONTROL_CHEM_DISINFECT ) || ( nelsonSupport != NELSON_CHEM_DISINFECT ) ) )
 #endif
     {
         if ( cd2Conductivity < MIN_PRIME_ACID_CONDUCTIVITY_US_PER_CM )
Index: firmware/App/Modes/ModeChemicalDisinfect.h
===================================================================
diff -u -re608f0a2bda2ad8df59a604a511cbd2a1c323dc3 -r86a4c29675dc34118aa9d4b55ead1d710a45ec10
--- firmware/App/Modes/ModeChemicalDisinfect.h	(.../ModeChemicalDisinfect.h)	(revision e608f0a2bda2ad8df59a604a511cbd2a1c323dc3)
+++ firmware/App/Modes/ModeChemicalDisinfect.h	(.../ModeChemicalDisinfect.h)	(revision 86a4c29675dc34118aa9d4b55ead1d710a45ec10)
@@ -20,7 +20,6 @@
 
 #include "DGCommon.h"
 #include "DGDefs.h"
-#include "ModeHeatDisinfect.h"
 
 /**
  *  @defgroup DGChemicalDisinfectMode DGChemicalDisinfectMode
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rb8f298547eb578000b3ff3cf55732fda7a689ce0 -r86a4c29675dc34118aa9d4b55ead1d710a45ec10
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b8f298547eb578000b3ff3cf55732fda7a689ce0)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 86a4c29675dc34118aa9d4b55ead1d710a45ec10)
@@ -956,6 +956,7 @@
          ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )         ||
          ( TRUE == isAlarmActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ) )  ||
          ( TRUE == isAlarmActive( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE ) )              ||
+         ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )           ||
          ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
     {
         status = TRUE;
Index: firmware/App/Modes/ModeHeatDisinfect.h
===================================================================
diff -u -r72bca5d2e489fa253f3bdfdb254261a32c7a0c19 -r86a4c29675dc34118aa9d4b55ead1d710a45ec10
--- firmware/App/Modes/ModeHeatDisinfect.h	(.../ModeHeatDisinfect.h)	(revision 72bca5d2e489fa253f3bdfdb254261a32c7a0c19)
+++ firmware/App/Modes/ModeHeatDisinfect.h	(.../ModeHeatDisinfect.h)	(revision 86a4c29675dc34118aa9d4b55ead1d710a45ec10)
@@ -41,19 +41,6 @@
     U32 r82CountdownTimeS;              ///< Heat disinfect reservoir 82 count down time in seconds.
 } MODE_HEAT_DISINFECT_UI_DATA_T;
 
-#ifndef _RELEASE_
-typedef enum Nelson_States
-{
-    NELSON_NONE = 0,                    ///< Nelson none.
-    NELSON_INOCULATE,                   ///< Nelson inoculate.
-    NELSON_HEAT_DISINFECT,              ///< Nelson heat disinfect.
-    NELSON_POS_CONTROL_CHEM_DISINFECT,  ///< Nelson positive control chemical disinfect.
-    NELSON_CHEM_DISINFECT,              ///< Nelson chemical disinfect.
-    NELSON_DRAIN_SAMPLES,               ///< Nelson drain sample.
-    NUM_OF_NELSON_SUPPORT               ///< Number of Nelson supports.
-} NELSON_SUPPORT_T;
-#endif
-
 // ********** public function prototypes **********
 
 void initHeatDisinfectMode( void );                                 // Initialize this module
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r86a4c29675dc34118aa9d4b55ead1d710a45ec10
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 86a4c29675dc34118aa9d4b55ead1d710a45ec10)
@@ -124,6 +124,10 @@
 
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
 
+#ifndef _RELEASE_
+
+#endif
+
     return standbyState;
 }
 
@@ -484,7 +488,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;