Index: firmware/App/HDCommon.h
===================================================================
diff -u -ra3c96cc0c4cb7c056c16326739df6ccbe459913c -r51147222d369a3023a11b2ee675178d058ffaf46
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a3c96cc0c4cb7c056c16326739df6ccbe459913c)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 51147222d369a3023a11b2ee675178d058ffaf46)
@@ -33,6 +33,7 @@
 //    #define RM46_EVAL_BOARD_TARGET          1
 //    #define BREADBOARD_TARGET               1
 //    #define SIMULATE_UI                     1
+    #define SKIP_POST                       1
     #define DISABLE_CRC_ERROR               1
     #define DISABLE_MOTOR_CURRENT_ERRORS    1
     #define SHOW_LOAD_CELL_IN_ROTOR_RPM     1
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r3c45b8930e1bbd1ff5757ec6d9e37e3d7a464fc3 -r51147222d369a3023a11b2ee675178d058ffaf46
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 3c45b8930e1bbd1ff5757ec6d9e37e3d7a464fc3)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 51147222d369a3023a11b2ee675178d058ffaf46)
@@ -32,6 +32,7 @@
     POST_STATE_ALARM_LAMP,
     POST_STATE_FPGA,
     POST_STATE_RTC,
+    POST_STATE_NVDATAMGMT,
     POST_STATE_STUCK_BUTTON,
     POST_STATE_COMPLETED,
     POST_STATE_FAILED,
@@ -103,6 +104,9 @@
 #ifdef RM46_EVAL_BOARD_TARGET
             postState = POST_STATE_COMPLETED;
 #endif
+#ifdef SKIP_POST
+            postState = POST_STATE_COMPLETED;
+#endif
             break;
 
         case POST_STATE_WATCHDOG:
@@ -125,6 +129,11 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
+        case POST_STATE_NVDATAMGMT:
+            testStatus = execNVDataMgmtSelfTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
         case POST_STATE_STUCK_BUTTON:
             testStatus = execStuckButtonTest();
             handlePOSTStatus( testStatus );
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r3c45b8930e1bbd1ff5757ec6d9e37e3d7a464fc3 -r51147222d369a3023a11b2ee675178d058ffaf46
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 3c45b8930e1bbd1ff5757ec6d9e37e3d7a464fc3)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 51147222d369a3023a11b2ee675178d058ffaf46)
@@ -302,6 +302,7 @@
         {
             lastOffButtonState = BUTTON_STATE_PRESSED;
             stopDialysis();
+            transitionToTreatmentStop();
             result = TREATMENT_STOP_STATE;
         }
     }
@@ -338,6 +339,7 @@
             lastOffButtonState = BUTTON_STATE_PRESSED;
             lastTreatmentTimeStamp = getMSTimerCount();
             startDialysis();
+            transitionToDialysis();
             result = TREATMENT_DIALYSIS_STATE;
         }
     }
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r04334ed8d1e927939718b1d62fb01afef0a2b9a9 -r51147222d369a3023a11b2ee675178d058ffaf46
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 04334ed8d1e927939718b1d62fb01afef0a2b9a9)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 51147222d369a3023a11b2ee675178d058ffaf46)
@@ -827,36 +827,6 @@
 }
 
 /*************************************************************************
- * @brief getFPGAId
- * The getFPGAId function gets the version read from the Id register \n
- * of the FPGA.
- * @details
- * Inputs : fpgaHeader
- * Outputs : none
- * @param none
- * @return Id
- *************************************************************************/
-U08 getFPGAId( void )
-{
-    return fpgaHeader.fpgaId;
-}
-
-/*************************************************************************
- * @brief getFPGARev
- * The getFPGARev function gets the revision read from the Rev register \n
- * of the FPGA.
- * @details
- * Inputs : fpgaHeader
- * Outputs : none
- * @param none
- * @return Revision
- *************************************************************************/
-U08 getFPGARev( void )
-{
-    return fpgaHeader.fpgaRev;
-}
-
-/*************************************************************************
  * @brief getFPGAStatus
  * The getFPGAStatus function gets the version read from the diagnostic register \n
  * of the FPGA.