Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r9d7ad180a18e29ba08bf65228d61b6179ddbfcca -r5bec978fa9cce89bbf8c559f0844b7528a10c0d1
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 9d7ad180a18e29ba08bf65228d61b6179ddbfcca)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 5bec978fa9cce89bbf8c559f0844b7528a10c0d1)
@@ -22,6 +22,7 @@
 #include "RTC.h"
 #include "WatchdogMgmt.h"
 #include "ModeInitPOST.h"
+#include "NVDataMgmt.h"
 
 // ********** private definitions **********
 
@@ -32,6 +33,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,8 +105,12 @@
             break;
 
         case POST_STATE_WATCHDOG:
+#ifndef RM46_EVAL_BOARD_TARGET
             testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );  // ignoring return value because last test
+#else
+            postState = POST_STATE_RTC;
+#endif
             break;
 
         case POST_STATE_ALARM_LAMP:
@@ -122,6 +128,13 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
+        // NVDataMgmt is dependent on RTC POST
+        // so RTC POST has to go first
+        case POST_STATE_NVDATAMGMT:
+            testStatus = execNVDataMgmtSelfTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
         case POST_STATE_STUCK_BUTTON:
             testStatus = execStuckButtonTest();
             handlePOSTStatus( testStatus );