Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r50144ec3e96785cf76d5bfd22ee65029c82e732b -r01be6e5783f939f65a49643422e2fe8c6f1c19c6
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 50144ec3e96785cf76d5bfd22ee65029c82e732b)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 01be6e5783f939f65a49643422e2fe8c6f1c19c6)
@@ -197,7 +197,7 @@
     else
     {
         // Current Beta 1.9 system uses on/off bit
-        setFPGAD79RinsePumpControl( RINSE_PUMP_TURN_OFF_CONTROL_BIT );
+        setValveState( D79_PMP_VALV, VALVE_STATE_CLOSED );
     }
 
     return state;
@@ -225,7 +225,7 @@
     else
     {
         // Current Beat 1.9 system uses on/off bit
-        setFPGAD79RinsePumpControl( RINSE_PUMP_TURN_ON_CONTROL_BIT );
+        setValveState( D79_PMP_VALV, VALVE_STATE_OPEN );
     }
 
     return state;
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r01be6e5783f939f65a49643422e2fe8c6f1c19c6
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 01be6e5783f939f65a49643422e2fe8c6f1c19c6)
@@ -18,6 +18,7 @@
 #include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
+#include "FPOperationModes.h"
 #include "Heaters.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
@@ -156,13 +157,15 @@
 static DD_STANDBY_MODE_STATE_T handleStandbyIdleState( void )
 {
     DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_IDLE;
+    FP_OP_MODE_T fpMode = getCurrentFPOperationMode();
 
     //TODO : Define comm loss alarm when TD is turned off or stops communicating
 //    if ( FALSE == isTDCommunicating() )
 //    {
             // define the alarm
 //    }
-    if ( TRUE == pendingStartDDPreGenRequest )
+    // wait for IOFP GENP mode and when IOFP manual control is not set
+    if ( ( TRUE == pendingStartDDPreGenRequest ) && ( FP_MODE_GENP == fpMode ) && ( getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) == FALSE ) )
     {
         pendingStartDDPreGenRequest = FALSE;
         requestNewOperationMode( DD_MODE_PREG );
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r01be6e5783f939f65a49643422e2fe8c6f1c19c6
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 01be6e5783f939f65a49643422e2fe8c6f1c19c6)
@@ -20,6 +20,7 @@
 
 #include "DDCommon.h"
 #include "DDDefs.h"
+#include "FPDefs.h"
 
 /**
  *  @defgroup DDStandbyMode DDStandbyMode
Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r01be6e5783f939f65a49643422e2fe8c6f1c19c6
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 01be6e5783f939f65a49643422e2fe8c6f1c19c6)
@@ -405,7 +405,7 @@
         {
             // Start FP Pre-Generate Permeate
 
-            if ( FP_MODE_STAN == fpMode )
+            if ( ( FP_MODE_STAN == fpMode ) && ( getTestConfigStatus( TEST_CONFIG_DD_RUN_SOLO ) == FALSE ) )
             {
                 fpReason = signalStartGenPermeate();
             }