Index: firmware/App/Controllers/PermeateTank.c
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -320,28 +320,24 @@
 
         case PERMEATE_TANK_FILL_STATE:
             setValveState( M4_VALV,VALVE_STATE_OPEN );
-            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV, VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_OPEN );   // TODO - Change valves to handle RO rejection config
             setValveState( P34_VALV, VALVE_STATE_CLOSED ); // Current set to Medium recovery for alpha HW
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_OPEN );
-            setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             tankFillDelayTime = getMSTimerCount();
             break;
 
         case PERMEATE_TANK_FULL_STATE:
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
-            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV, VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_OPEN );
             setValveState( P34_VALV, VALVE_STATE_OPEN );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_CLOSED );
-            setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             tankFullDelayTime = getMSTimerCount();
             tankFullAlarmTimeout = getMSTimerCount();
Index: firmware/App/Modes/FPModes/FPModeFault.c
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/FPModeFault.c	(.../FPModeFault.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FPModeFault.c	(.../FPModeFault.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -283,14 +283,12 @@
         if ( TRUE == isDrainEnabled )
         {
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
-            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV, VALVE_STATE_OPEN );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_CLOSED );
             setValveState( P34_VALV, VALVE_STATE_CLOSED );
             setValveState( P37_VALV, VALVE_STATE_OPEN );
             setValveState( P39_VALV, VALVE_STATE_OPEN );
-            setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
         }
         else
Index: firmware/App/Modes/FPModes/FPModeStandby.c
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/FPModeStandby.c	(.../FPModeStandby.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FPModeStandby.c	(.../FPModeStandby.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -66,14 +66,12 @@
     initFPStandbyMode();
 
     setValveState( M4_VALV,VALVE_STATE_CLOSED );
-    setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
     setValveState( P43_VALV, VALVE_STATE_CLOSED );
 
     signalROPumpHardStop();
Index: firmware/App/Modes/FPModes/FlushConcentrate.c
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/FlushConcentrate.c	(.../FlushConcentrate.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Modes/FPModes/FlushConcentrate.c	(.../FlushConcentrate.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -203,14 +203,12 @@
     {
         case CONC_FLUSH_IN_PROGRESS:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
-            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV, VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_CLOSED );
             setValveState( P34_VALV, VALVE_STATE_CLOSED );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_OPEN );
-            setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             startPermeateTankControl();
             if ( TRUE == isBoostPumpInstalled() )
@@ -227,14 +225,12 @@
             if ( FALSE == isConcentrateFlushComplete() )
             {
                 setValveState( M4_VALV, VALVE_STATE_CLOSED );
-                setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
                 setValveState( P43_VALV, VALVE_STATE_CLOSED );
 
                 if ( TRUE == isBoostPumpInstalled() )
Index: firmware/App/Modes/FPModes/FlushFilter.c
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/FlushFilter.c	(.../FlushFilter.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/FlushFilter.c	(.../FlushFilter.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -191,14 +191,12 @@
     {
         case FILTER_FLUSH_IN_PROGRESS:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
-            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV, VALVE_STATE_OPEN );
             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_OPEN );
-            setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             filterFlushTimer = getMSTimerCount();
             break;
@@ -208,14 +206,12 @@
             if ( FALSE == isFilterFlushComplete() )
             {
                 setValveState( M4_VALV, VALVE_STATE_CLOSED );
-                setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
                 setValveState( P43_VALV, VALVE_STATE_CLOSED );
             }
             break;
Index: firmware/App/Modes/FPModes/FlushPermeate.c
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -208,14 +208,12 @@
     {
         case PERM_FLUSH_IN_PROGRESS:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
-            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV, VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_CLOSED );
             setValveState( P34_VALV, VALVE_STATE_CLOSED );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_OPEN );
-            setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             startPermeateTankControl();
             if ( TRUE == isBoostPumpInstalled() )
@@ -234,14 +232,12 @@
             if ( FALSE == isPermeateFlushComplete() )
             {
                 setValveState( M4_VALV, VALVE_STATE_CLOSED );
-                setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
                 setValveState( P43_VALV, VALVE_STATE_CLOSED );
 
                 if ( TRUE == isBoostPumpInstalled() )
Index: firmware/App/Modes/FPModes/InletPressureCheck.c
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/InletPressureCheck.c	(.../InletPressureCheck.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Modes/FPModes/InletPressureCheck.c	(.../InletPressureCheck.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -200,14 +200,12 @@
     {
         case INLET_PRES_CHECK_IN_PROGRESS:
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
-            setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
 
             if ( TRUE == isBoostPumpInstalled() )
@@ -223,14 +221,12 @@
             if ( FALSE == isInletPressureCheckCompleted() )
             {
                 setValveState( M4_VALV, VALVE_STATE_CLOSED );
-                setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
                 setValveState( P43_VALV, VALVE_STATE_CLOSED );
 
                 if ( TRUE == isBoostPumpInstalled() )
Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -140,27 +140,23 @@
     {
         case FP_GENP_DEF_SUPPLY_WATER:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
-            setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             break;
 
         case FP_GENP_DEF_PAUSED:
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
-            setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             break;
 
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.c
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -187,14 +187,12 @@
 
         case FP_PRE_GENP_VERIFY_WATER:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
-            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV, VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_OPEN ); // TODO - Change valves to handle RO rejection config
             setValveState( P34_VALV, VALVE_STATE_CLOSED ); // Current set to Medium recovery for alpha HW
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_OPEN );
-            setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
 
             if ( TRUE == isBoostPumpInstalled() )
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -151,42 +151,36 @@
     {
         case FP_PRE_GENP_DEF_FLUSH:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
-            setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             preGenPermeateDefFlushTimer = getMSTimerCount();
             break;
 
         case FP_PRE_GENP_DEF_INLET_WATER_CHECK:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
-            setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             preGenPermeateDefWaterCheckTimer = getMSTimerCount();
             break;
 
         case FP_PRE_GENP_DEF_PAUSED:
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
-            setValveState( M7_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( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             break;
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319 -re8a090df33223455312adc5ad494a3b5e2507f00
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
@@ -210,8 +210,12 @@
     { MSG_ID_FP_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,                   &testFPPressureSensorFilteredReadingsOverride },
     { MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,                &testFPPressureSensorFilteredTemperatureReadingsOverride },
     { MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testFPTemperatureSensorsDataPublishIntervalOverride },
+    { MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                            &testIOFPValvesStatesPublishIntervalOverride },
+    { MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST,                                   &testIOFPValveStateOverride },
+    { MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                                &testIOFPValveSensedStateOverride },
 };
 
+/// Calculation for number of entries in the incoming message function handler look-up table.
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
 
 // ********** private data **********