Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r0b121a7c92a8d86f8369b7094b0bce21389f3747 -r5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 0b121a7c92a8d86f8369b7094b0bce21389f3747)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1)
@@ -168,7 +168,7 @@
 U32 transitionToFlushMode( void )
 {
     // Reset all the actuators
-    deenergizeActuators();
+    deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initFlushMode();
 
@@ -298,7 +298,7 @@
     if ( DG_MODE_FLUS == getCurrentOperationMode() )
     {
         // Reset all the actuators
-        deenergizeActuators();
+        deenergizeActuators( NO_PARK_CONC_PUMPS );
 
         // Transition to mode standby
         requestNewOperationMode( DG_MODE_STAN );
@@ -809,7 +809,7 @@
 
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_WITH_FRESH_WATER_WAIT_TIME_MS ) )
     {
-        deenergizeActuators();
+        deenergizeActuators( NO_PARK_CONC_PUMPS );
         flushUIState = FLUSH_UI_STATE_COMPLETE;
         state = DG_FLUSH_STATE_COMPLETE;
     }
@@ -857,7 +857,7 @@
     if ( FALSE == hasWaterCancellationBeenSet )
     {
         // Stop all the actuators first then decide who should run next
-        deenergizeActuators();
+        deenergizeActuators( NO_PARK_CONC_PUMPS );
 
         // Set the actuators
         setValveState( VPI, VALVE_STATE_CLOSED );
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r0b121a7c92a8d86f8369b7094b0bce21389f3747 -r5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 0b121a7c92a8d86f8369b7094b0bce21389f3747)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1)
@@ -255,7 +255,8 @@
  *************************************************************************/
 U32 transitionToHeatDisinfectMode( void )
 {
-    deenergizeActuators();
+    // Set all the actuators to reset and de-energized state
+    deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectMode();
 
@@ -404,7 +405,7 @@
     if ( DG_MODE_HEAT == getCurrentOperationMode() )
     {
         // Reset all the actuators
-        deenergizeActuators();
+        deenergizeActuators( NO_PARK_CONC_PUMPS );
 
         // Transition to mode standby
         requestNewOperationMode( DG_MODE_STAN );
@@ -440,9 +441,6 @@
     // Start overall heat disinfect timer
     overallHeatDisinfectTimer = getMSTimerCount();
 
-    // Set all the actuators to reset and de-energized state
-    deenergizeActuators();
-
     // If the inlet pressure is less than or equal to the threshold or TDi and TRo difference is greater than 3 C, the cycle
     // should be canceled
     if ( ( ppiPressure <= MIN_INLET_PRESSURE_PSI ) || ( fabs( TDiTemp - TRoTemp ) > MAX_START_STATE_TEMP_SENSORS_DIFF_C ) )
@@ -1375,7 +1373,7 @@
         F32 TRo       = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
 
         // Stop all the actuators first then decide who should run next
-        deenergizeActuators();
+        deenergizeActuators( NO_PARK_CONC_PUMPS );
 
         // The two sensors must be less than a threshold to decide if mix drain is needed to normal drain
         if ( ( TDi < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) && ( TRo < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) )
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r0b121a7c92a8d86f8369b7094b0bce21389f3747 -r5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 0b121a7c92a8d86f8369b7094b0bce21389f3747)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1)
@@ -119,7 +119,7 @@
     // re-initialize standby mode each time we transition to standby mode
     initStandbyMode();
 
-    deenergizeActuators();
+    deenergizeActuators( PARK_CONC_PUMPS );
 
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r0b121a7c92a8d86f8369b7094b0bce21389f3747 -r5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0b121a7c92a8d86f8369b7094b0bce21389f3747)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1)
@@ -2799,7 +2799,7 @@
         result = TRUE;
 
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
-        if ( ( BOOL )payload.state.u32 )
+        if ( TRUE == ( BOOL )payload.state.u32 )
         {
             requestConcentratePumpOn( ( CONCENTRATE_PUMPS_T )payload.index );
         }