Index: firmware/App/Modes/FPModes/FPModeStandby.c
===================================================================
diff -u -r3e1af7cc2576e347ab8bdf2f400196b2301def07 -r32b198b922f305a1838fe10e42d5dc83325f0180
--- firmware/App/Modes/FPModes/FPModeStandby.c	(.../FPModeStandby.c)	(revision 3e1af7cc2576e347ab8bdf2f400196b2301def07)
+++ firmware/App/Modes/FPModes/FPModeStandby.c	(.../FPModeStandby.c)	(revision 32b198b922f305a1838fe10e42d5dc83325f0180)
@@ -69,18 +69,28 @@
     resetPermeateTank();
     setValveState( M4_VALV,VALVE_STATE_CLOSED );
     setValveState( M12_VALV, VALVE_STATE_CLOSED );
-    setValveState( P6_VALV,VALVE_STATE_CLOSED );
-    setValveState( P11_VALV,VALVE_STATE_CLOSED );
-    setValveState( P33_VALV, VALVE_STATE_CLOSED );
-    setValveState( P34_VALV,VALVE_STATE_CLOSED );
-    setValveState( P37_VALV, VALVE_STATE_CLOSED );
-    setValveState( P39_VALV,VALVE_STATE_CLOSED );
+    if ( TRUE == isFPDefeatured() )
+    {
+        ;//do nothing if required will add valves based on the requirement.
+    }
+    else
+    {
+        setValveState( P3_VALV,VALVE_STATE_CLOSED );
+        setValveState( P6_VALV,VALVE_STATE_CLOSED );
+        setValveState( P11_VALV,VALVE_STATE_CLOSED );
+        setValveState( P33_VALV, VALVE_STATE_CLOSED );
+        setValveState( P34_VALV,VALVE_STATE_CLOSED );
+        setValveState( P37_VALV, VALVE_STATE_CLOSED );
+        setValveState( P39_VALV,VALVE_STATE_CLOSED );
+        setValveState( P43_VALV,VALVE_STATE_CLOSED );
+        setValveState( P48_VALV,VALVE_STATE_CLOSED );
 
-    signalROPumpHardStop();
+        signalROPumpHardStop();
 
-    if ( TRUE == isBoostPumpInstalled() )
-    {
-        signalBoostPumpHardStop();
+        if ( TRUE == isBoostPumpInstalled() )
+        {
+            signalBoostPumpHardStop();
+        }
     }
 
     return standbyState;
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r174197d53ce0d602350536bbe15fef807ddb0a6d -r32b198b922f305a1838fe10e42d5dc83325f0180
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 174197d53ce0d602350536bbe15fef807ddb0a6d)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 32b198b922f305a1838fe10e42d5dc83325f0180)
@@ -24,6 +24,7 @@
 #include "OperationModes.h"
 #include "RinsePump.h"
 #include "SafetyShutdown.h"
+#include "SubstitutionPump.h"
 #include "Utilities.h"
 #include "Valves.h"
 
@@ -193,12 +194,12 @@
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D80_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D81_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D83_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D85_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D88_79_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D91_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( D95_VALV,  VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D81_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D83_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D85_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D88_79_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D91_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D95_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D100_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize Balancing chamber and Ultrafiltration valves
@@ -212,7 +213,7 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
-    signalDialysatePumpHardStop( D92_PUMP );
+    requestSubstitutionPumpOff( D92_PUMP );
     setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
@@ -251,6 +252,14 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D80_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D81_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D83_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D85_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D88_79_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D91_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D95_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( D100_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize portion of balancing chamber valves.
     setValveStateDelayed( D19_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
@@ -263,9 +272,11 @@
     requestConcentratePumpOff( D76_PUMP, parkPumps );
     signalDialysatePumpHardStop( D12_PUMP );
     signalDialysatePumpHardStop( D48_PUMP );
+    requestSubstitutionPumpOff( D92_PUMP );
     setRinsePumpState( RINSE_PUMP_STATE_OFF );
     stopHeater( D5_HEAT );
     stopHeater( D45_HEAT );
+    stopHeater( D108_HEAT );
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r174197d53ce0d602350536bbe15fef807ddb0a6d -r32b198b922f305a1838fe10e42d5dc83325f0180
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 174197d53ce0d602350536bbe15fef807ddb0a6d)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 32b198b922f305a1838fe10e42d5dc83325f0180)
@@ -44,13 +44,12 @@
 
 // ********** private data **********
 
-static DD_STANDBY_MODE_STATE_T standbyState;                                              ///< Currently active standby state.
+static DD_STANDBY_MODE_STATE_T standbyState;                                            ///< Currently active standby state.
 
-static BOOL pendingStartDDPreGenRequest;                                                  ///< Flag indicating TD has requested DD start the pre generation dialysate request.
+static BOOL pendingStartDDPreGenRequest;                                                ///< Flag indicating TD has requested DD start the pre generation dialysate request.
 static BOOL pendingStartDDFlushRequest;                                                 ///< Flag indicating TD has requested DD start flush.
 static BOOL pendingStartDDHeatDisinfectRequest;                                         ///< Flag indicating TD has requested DD start heat disinfect.
 static BOOL pendingStartDDHeatDisinfectActiveCoolRequest;                               ///< Flag indicating TD has requested DD start heat disinfect active cool.
-static BOOL pendingStartDDROPermeateSampleRequest;                                      ///< Flag indicating TD has requested DD to command RO to start permeate sample.
 
 // ********** private function prototypes **********
 
@@ -71,7 +70,6 @@
     pendingStartDDFlushRequest                   = FALSE;
     pendingStartDDHeatDisinfectRequest           = FALSE;
     pendingStartDDHeatDisinfectActiveCoolRequest = FALSE;
-    pendingStartDDROPermeateSampleRequest        = FALSE;
 }
 
 /*********************************************************************//**
@@ -195,11 +193,6 @@
 
         requestNewOperationMode( DD_MODE_HCOL );
     }
-    else if ( TRUE == pendingStartDDROPermeateSampleRequest )
-    {
-        pendingStartDDROPermeateSampleRequest = FALSE;
-        requestNewOperationMode( DD_MODE_ROPS );
-    }
 
     return state;
 }