Index: firmware/App/Services/NVMsgQ.c
===================================================================
diff -u -r1be7dc9ec7ae5a6576a4c841e3b22ac77aea8db8 -ra68c7679e493224bd41df72321d4c2537207234f
--- firmware/App/Services/NVMsgQ.c	(.../NVMsgQ.c)	(revision 1be7dc9ec7ae5a6576a4c841e3b22ac77aea8db8)
+++ firmware/App/Services/NVMsgQ.c	(.../NVMsgQ.c)	(revision a68c7679e493224bd41df72321d4c2537207234f)
@@ -30,7 +30,7 @@
 
 // ********** private definitions **********
 
-#define QUEUE_MAX_SIZE                       20U                                                                ///< Max queue size.
+#define QUEUE_MAX_SIZE                       50U                                                                ///< Max queue size.
 #define QUEUE_START_INDEX                    0U                                                                 ///< Queue start index.
 #define MAX_JOB_DATA_SIZE_BYTES              32U                                                                ///< Max bytes per job (32 bytes).
 #define NUM_OF_BYTES_PER_RECORD_PAYLOAD      ( MAX_MSG_PAYLOAD_SIZE - ( sizeof( U32 ) * 3 ) )                   ///< Number of bytes per calibration payload.
@@ -62,7 +62,7 @@
 typedef struct
 {
     NVDATAMGMT_OPERATION_STATE_T memoryOperation;                                                               ///< Memory operation.
-    U32  startAddress;                                                                                          ///< Operation start address.
+    U32  recordFlashAddress;                                                                                          ///< Operation start address.
     U08  buffer[ MAX_JOB_DATA_SIZE_BYTES ];                                                                     ///< Buffer.
     U32  length;                                                                                                ///< Length of a buffer.
 } MEMORY_OPS_T;