Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667 -r5398b91c33e6fd39a74dbe132e50120965ef4107
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 5398b91c33e6fd39a74dbe132e50120965ef4107)
@@ -93,8 +93,8 @@
     currentSubState          = NO_FP_SUB_STATE;
     current4thLevelState     = NO_FP_SUB_STATE;
     broadcastModeIntervalCtr = DATA_PUBLISH_COUNTER_START_COUNT;
-    isDeviceDefeatured = FALSE;
-    isBoostInstalled = FALSE;
+    isDeviceDefeatured       = FALSE;
+    isBoostInstalled         = FALSE;
 
     transitionToNewOperationMode( FP_MODE_INIT );
 
@@ -129,7 +129,7 @@
     // Is requested new mode valid and legal at this time?
     if ( ( newMode >= FP_MODE_NLEG ) && ( isTestingActivated() != TRUE ) )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
         newMode = currentMode;
     }
 
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -r5398b91c33e6fd39a74dbe132e50120965ef4107
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision e8a090df33223455312adc5ad494a3b5e2507f00)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 5398b91c33e6fd39a74dbe132e50120965ef4107)
@@ -38,9 +38,9 @@
 
 // ********** private data **********
 
-static FP_PRE_GENP_DEF_MODE_STATE_T preGenPermeateDefState;                                               ///< Currently active generate Permeate Defeatured state.
-static U32 preGenPermeateDefDataPublicationTimerCounter;                                          ///< Used to schedule generate Permeate data publication to CAN bus.
-static OVERRIDE_U32_T preGenPermeateDefDataPublishInterval;                                       ///< Generate permeate mode data publish interval.
+static FP_PRE_GENP_DEF_MODE_STATE_T preGenPermeateDefState;                                        ///< Currently active generate Permeate Defeatured state.
+static U32 preGenPermeateDefDataPublicationTimerCounter;                                           ///< Used to schedule generate Permeate data publication to CAN bus.
+static OVERRIDE_U32_T preGenPermeateDefDataPublishInterval;                                        ///< Generate permeate mode data publish interval.
 static BOOL pendingStartPreGenDefRequest;                                                          ///< Flag indicating DD has requested FP start the generate permeate.
 static U32 preGenPermeateDefFlushTimer;
 static U32 preGenPermeateDefWaterCheckTimer;
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r3ebd93b5235d4fde813ce09d15fa5fd163ca0902 -r5398b91c33e6fd39a74dbe132e50120965ef4107
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 3ebd93b5235d4fde813ce09d15fa5fd163ca0902)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 5398b91c33e6fd39a74dbe132e50120965ef4107)
@@ -188,7 +188,6 @@
     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( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize Balancing chamber and Ultrafiltration valves
     for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ )
@@ -237,7 +236,6 @@
     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( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize portion of balancing chamber valves.
     setValveStateDelayed( D19_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r38ee99e9adeb19cacb0c88807e8f6f48b076a241 -r5398b91c33e6fd39a74dbe132e50120965ef4107
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 5398b91c33e6fd39a74dbe132e50120965ef4107)
@@ -206,7 +206,6 @@
             break;
 
         case DD_GEND_DIALYSATE_BYPASS_STATE:
-            setValveState( M4_VALV, VALVE_STATE_OPEN );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );   // Drain valve
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
@@ -436,9 +435,6 @@
     BOOL result                 = FALSE;
     LEVEL_STATE_T floaterLevel  = getLevelStatus( D6_LEVL );
 
-    //Make sure Water Inlet Valve is open
-    setValveState( M4_VALV, VALVE_STATE_OPEN );
-
     // High level is met
     if ( LEVEL_STATE_HIGH == floaterLevel )
     {
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -rd27cbe971509e825c51b17500e289627136b3ab7 -r5398b91c33e6fd39a74dbe132e50120965ef4107
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision d27cbe971509e825c51b17500e289627136b3ab7)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 5398b91c33e6fd39a74dbe132e50120965ef4107)
@@ -75,10 +75,10 @@
     U32 i;
 
     levelsDataPublicationCounter                = DATA_PUBLISH_COUNTER_START_COUNT;
-    fplevelsDataPublishInterval.data           = LEVEL_DATA_PUB_INTERVAL;
-    fplevelsDataPublishInterval.ovData         = LEVEL_DATA_PUB_INTERVAL;
-    fplevelsDataPublishInterval.ovInitData     = 0;
-    fplevelsDataPublishInterval.override       = OVERRIDE_RESET;
+    fplevelsDataPublishInterval.data            = LEVEL_DATA_PUB_INTERVAL;
+    fplevelsDataPublishInterval.ovData          = LEVEL_DATA_PUB_INTERVAL;
+    fplevelsDataPublishInterval.ovInitData      = 0;
+    fplevelsDataPublishInterval.override        = OVERRIDE_RESET;
     levelsDataPublishInterval.data              = LEVEL_DATA_PUB_INTERVAL;
     levelsDataPublishInterval.ovData            = LEVEL_DATA_PUB_INTERVAL;
     levelsDataPublishInterval.ovInitData        = 0;