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 );