Index: firmware/App/Services/NVMsgQ.h
===================================================================
diff -u -r1be7dc9ec7ae5a6576a4c841e3b22ac77aea8db8 -rb878faee61a0800b767d053ab3f65afb3790dacb
--- firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision 1be7dc9ec7ae5a6576a4c841e3b22ac77aea8db8)
+++ firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision b878faee61a0800b767d053ab3f65afb3790dacb)
@@ -43,7 +43,7 @@
 #define INSTIT_RECORD_NV_MEM_START_ADDRESS       ( BANK7_SECTOR2_START_ADDRESS + INSTIT_RECORD_OFFSET )
 #define USAGE_INFO_START_ADDRESS                 ( BANK7_SECTOR3_START_ADDRESS + USAGE_RECORD_OFFSET )          ///< DD usage info start address in RTC RAM (48).
 
-#define MIN_JOBS_NEEDED_FOR_SECTOR_0         5U                                                                 ///< Min queue count needed to erase and write all (5) records back in sector 0.
+#define MIN_JOBS_NEEDED_FOR_ALL_RECORDS          ( NUM_OF_NVDATMGMT_RECORDS_JOBS * 2 )                          ///< Min queue count needed to erase and write all records
 
 /// NVDataMgmt records read status
 typedef enum NVDataMgmt_NV_Records_Read_Status
@@ -69,15 +69,17 @@
 BOOL enqueueSector0Records( void );
 void enqueuePOSTReadRecords( void );
 
+BOOL enqueueNVMReceiveRecord( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *payloadPtr );
+
 BOOL testDDGetNVRecord( MESSAGE_T *message );
 BOOL testDDSetNVRecord( MESSAGE_T *message );
 void handleSendInstitutionalRecordToUI( MESSAGE_T* message );
 BOOL receiveRecordFromDialin( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr );
 BOOL isNewCalibrationRecordAvailable( void );
 
-void updateNewCalAvailableFlag( BOOL value );
+void updateNewNVRecordAvailableFlag( BOOL value );
 void updateRecordReadStatus( NVDATAMGMT_RECORDS_READ_STATUS_T status );
-void updateCalStartTimer( U32 value );
+void updateRecordStartTimer( U32 value );
 
 PROCESS_RECORD_JOB_T getCurrentProcessRecordJob ( void );