Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -red94e224d840fc75f9d287f4f307356421c944f3 -r7da76d7131d824ab15f58857eeeedcf128e57391
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision ed94e224d840fc75f9d287f4f307356421c944f3)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 7da76d7131d824ab15f58857eeeedcf128e57391)
@@ -45,7 +45,10 @@
     // Initialize all the switches
     for ( i = 0; i < NUM_OF_DOORS_AND_CAPS; i++ )
     {
-        switchStatus[ i ].data = (U32)STATE_CLOSED;
+        switchStatus[ i ].data       = (U32)STATE_CLOSED;
+        switchStatus[ i ].ovData     = (U32)STATE_CLOSED;
+        switchStatus[ i ].ovInitData = (U32)STATE_CLOSED;
+        switchStatus[ i ].override   = OVERRIDE_RESET;
     }
 }
 
@@ -215,8 +218,8 @@
         if ( isTestingActivated() )
         {
             result = TRUE;
-            switchStatus[ switchId ].ovData     = status;
-            switchStatus[ switchId ].override   = OVERRIDE_KEY;
+            switchStatus[ switchId ].ovData   = status;
+            switchStatus[ switchId ].override = OVERRIDE_KEY;
         }
     }
 
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rabc9d65a7158bae927614b646ecb6f38a7ef310c -r7da76d7131d824ab15f58857eeeedcf128e57391
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision abc9d65a7158bae927614b646ecb6f38a7ef310c)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 7da76d7131d824ab15f58857eeeedcf128e57391)
@@ -23,6 +23,7 @@
 #include "Comm.h"
 #include "Compatible.h"
 #include "FPGA.h"
+#include "PersistentAlarm.h"
 #include "SystemCommMessages.h"
 #include "Utilities.h"
 
@@ -100,6 +101,7 @@
 
 #define FPGA_ALARM_AUDIO_VOLUME_SHIFT   3                       ///< Shift alarm audio volume 3 bits to left before writing to register.
 #define FRONT_DOOR_SWITCH_MASK          0x0010                  ///< Front door switch bit mask.
+#define FPGA_POWER_OUT_TIMEOUT_MS       ( 2 * MS_PER_SECOND )   ///< FPGA power out timeout in milliseconds.
 
 // FPGA Sensors Record
 #pragma pack(push,1)
@@ -311,6 +313,7 @@
 static void startDMAReceiptOfReadResp( void );
 
 static void consumeUnexpectedData( void );
+static void monitorFPGAPowerStatus( void );
 
 /*********************************************************************//**
  * @brief
@@ -930,6 +933,18 @@
 
 /*********************************************************************//**
  * @brief
+ * The monitorFPGAPowerStatus function monitors the status of the FPGA power source.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return none
+ *************************************************************************/
+static void monitorFPGAPowerStatus( void )
+{
+
+}
+
+/*********************************************************************//**
+ * @brief
  * The setupDMAForWriteCmd function sets the byte count for the next DMA
  * write command to the FPGA.
  * @details Inputs: none
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -rabc9d65a7158bae927614b646ecb6f38a7ef310c -r7da76d7131d824ab15f58857eeeedcf128e57391
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision abc9d65a7158bae927614b646ecb6f38a7ef310c)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 7da76d7131d824ab15f58857eeeedcf128e57391)
@@ -152,7 +152,6 @@
 
 U16 getFPGAFrontDoorStatus( void );
 
-
 // The PWM functions are only used during debugging
 #ifdef DEBUG_ENABLED
     void setFPGAValveDialyzerInletPWM( U16 count );
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd8fa48ead3336b1fe090b42030a8648264831076 -r7da76d7131d824ab15f58857eeeedcf128e57391
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d8fa48ead3336b1fe090b42030a8648264831076)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7da76d7131d824ab15f58857eeeedcf128e57391)
@@ -1157,7 +1157,7 @@
 
         case MSG_ID_REQUEST_FW_VERSIONS:
             handleFWVersionRequest( message );
-            handleHDSerialNumberRequest( message );
+            handleHDSerialNumberRequest();
             break;
 
         case MSG_ID_DG_TEMPERATURE_DATA:
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd8fa48ead3336b1fe090b42030a8648264831076 -r7da76d7131d824ab15f58857eeeedcf128e57391
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d8fa48ead3336b1fe090b42030a8648264831076)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7da76d7131d824ab15f58857eeeedcf128e57391)
@@ -3905,10 +3905,9 @@
  * @details Inputs: none
  * @details Outputs: message handled, response constructed and queued
  * for transmit.
- * @param message a pointer to the message to handle.
  * @return none
  *************************************************************************/
-void handleHDSerialNumberRequest( MESSAGE_T *message )
+void handleHDSerialNumberRequest( void )
 {
     MESSAGE_T msg;
     HD_SYSTEM_RECORD_T system = getHDSystemRecord();
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd8fa48ead3336b1fe090b42030a8648264831076 -r7da76d7131d824ab15f58857eeeedcf128e57391
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d8fa48ead3336b1fe090b42030a8648264831076)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7da76d7131d824ab15f58857eeeedcf128e57391)
@@ -69,7 +69,7 @@
 void handleFWVersionRequest( MESSAGE_T *message );
 
 // MSG_ID_REQUEST_FW_VERSIONS
-void handleHDSerialNumberRequest( MESSAGE_T *message );
+void handleHDSerialNumberRequest( void );
 
 // MSG_ID_UI_REQUEST_SERVICE_INFO
 void handleHDServiceScheduleRequest( MESSAGE_T *message );