Index: firmware/App/DGCommon.h
===================================================================
diff -u -rbbd5ac2589c8093f681f2284367975ddd220b553 -r1154e93c2fddd59e81f4a07230c13e0d889ffdf1
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision bbd5ac2589c8093f681f2284367975ddd220b553)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 1154e93c2fddd59e81f4a07230c13e0d889ffdf1)
@@ -33,6 +33,7 @@
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
     #define BOARD_WITH_NO_HARDWARE          1
+    #define DONT_SKIP_NV_POST               1
 //    #define SIMULATE_UI                     1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
 //    #define DISABLE_HEATERS_AND_TEMPS       1
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r5e595c58d494cfd452a8a9e89aec3bb8def793e2 -r1154e93c2fddd59e81f4a07230c13e0d889ffdf1
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 5e595c58d494cfd452a8a9e89aec3bb8def793e2)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 1154e93c2fddd59e81f4a07230c13e0d889ffdf1)
@@ -94,8 +94,11 @@
             postState = DG_POST_STATE_FPGA;
 #ifdef SKIP_POST
             postState = DG_POST_STATE_COMPLETED;
-            postState = DG_POST_STATE_RTC;
 #endif
+#ifdef DONT_SKIP_NV_POST
+            // Only run NVDataMgmt POST
+            postState = DG_POST_STATE_NVDATAMGMT;
+#endif
             break;
 
         case DG_POST_STATE_FPGA:
@@ -111,11 +114,17 @@
         case DG_POST_STATE_NVDATAMGMT:
             testStatus = execNVDataMgmtSelfTest();
             postState = handlePOSTStatus( testStatus );
+
             break;
 
         case DG_POST_STATE_TEMPERATURE_SENSORS:
+#ifdef DONT_SKIP_NV_POST
+            // Skip the rest of the POSTs
+            postState = DG_POST_STATE_COMPLETED;
+#else
             testStatus = execTemperatureSensorsSelfTest();
             postState = handlePOSTStatus( testStatus );
+#endif
             break;
 
         case DG_POST_STATE_HEATERS:
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rbbd5ac2589c8093f681f2284367975ddd220b553 -r1154e93c2fddd59e81f4a07230c13e0d889ffdf1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision bbd5ac2589c8093f681f2284367975ddd220b553)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1154e93c2fddd59e81f4a07230c13e0d889ffdf1)
@@ -1234,6 +1234,7 @@
 
             case MSG_ID_DG_SET_SCHEDULED_RUNS_RECORD:
                 handleSetDGScheduledRunsRecord( message );
+                break;
 
             case MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
                 handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rbbd5ac2589c8093f681f2284367975ddd220b553 -r1154e93c2fddd59e81f4a07230c13e0d889ffdf1
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision bbd5ac2589c8093f681f2284367975ddd220b553)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1154e93c2fddd59e81f4a07230c13e0d889ffdf1)
@@ -292,7 +292,7 @@
 // MSG_ID_DG_SET_CALIBRATION_DATA
 void handleSetDGCalibrationRecord( MESSAGE_T *message );
 
-// MSG_ID_DG_GET_CALIBRATION_DATA
+// MSG_ID_DG_GET_CALIBRATION_RECORD
 void handleGetDGCalibrationRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_SYSTEM_DATA