Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r427b37ad929a8d88b5fcb9ae21a4f4146ffd2fef -ra9368b25cce2a179c56b1609b735178b286bb03d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 427b37ad929a8d88b5fcb9ae21a4f4146ffd2fef)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision a9368b25cce2a179c56b1609b735178b286bb03d)
@@ -1213,8 +1213,12 @@
     //wait after drain or fill
     if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
-        state = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
-        cmdSetDGActiveReservoir( inactiveReservoir );
+        DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
+
+        rsrvrCmd.reservoirID            = (U32)inactiveReservoir;
+        rsrvrCmd.useLastTrimmerHeaterDC = TRUE;
+        state                           = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
+        cmdSetDGActiveReservoir( &rsrvrCmd );
     }
 
     return state;
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rd9b4581350e00e87b211b0c81f8c34f02576fcf2 -ra9368b25cce2a179c56b1609b735178b286bb03d
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision d9b4581350e00e87b211b0c81f8c34f02576fcf2)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision a9368b25cce2a179c56b1609b735178b286bb03d)
@@ -2341,18 +2341,22 @@
     return ( fpgaSensorReadings.fpgaGPIO & PUMP_TRACK_SWITCH_MASK );
 }
 
+#ifndef _RELEASE_
 /*********************************************************************//**
  * @brief
- * The getFPGAHWConfiguration function gets the FPGA hardware configuration
- * such as BETA or DVT.
- * @details Inputs: fpgaSensorReadings
+ * The getHardwareConfigStatus function returns the status of the hardware
+ * configuration.
+ * @details Inputs: none
  * @details Outputs: none
- * @return hardware configuration
+ * @return  status of the hardware configuration
  *************************************************************************/
-U08 getFPGAHWConfiguration( void )
+HARDWARE_CONFIG_T getHardwareConfigStatus( void )
 {
-    return fpgaSensorReadings.fpgaHWConfigReg;
+    HARDWARE_CONFIG_T configValue = (HARDWARE_CONFIG_T)fpgaSensorReadings.fpgaHWConfigReg;
+
+    return configValue;
 }
+#endif
 
 #ifdef DEBUG_ENABLED
 /*********************************************************************//**
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -r9d81efee3ea73c452bb6b84501c8accf85ab81f7 -ra9368b25cce2a179c56b1609b735178b286bb03d
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision a9368b25cce2a179c56b1609b735178b286bb03d)
@@ -20,6 +20,7 @@
 
 #include "HDCommon.h"
 #include "Interrupts.h"
+#include "Utilities.h"
 
 
 /**
@@ -152,7 +153,9 @@
 U16 getFPGAFrontDoorStatus( void );
 U16 getFPGAPumpTrackSwitchStatus( void );
 
-U08 getFPGAHWConfiguration( void );
+#ifndef _RELEASE_
+HARDWARE_CONFIG_T getHardwareConfigStatus( void );
+#endif
 
 // The PWM functions are only used during debugging
 #ifdef DEBUG_ENABLED