Index: NVDataMgmt.c
===================================================================
diff -u -r14ed4a9910a870644292d72af84c6c4e62bde348 -r1dbc1d03d050c7b28c744d9f4f599ed35fa7ce9c
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 14ed4a9910a870644292d72af84c6c4e62bde348)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1dbc1d03d050c7b28c744d9f4f599ed35fa7ce9c)
@@ -29,8 +29,8 @@
 
 #define QUEUE_MAX_SIZE                     20U                                                                  ///< Max queue size
 #define QUEUE_START_INDEX                  0U                                                                   ///< Queue start index
-#define MIN_JOBS_NEEDED_FOR_DATA_LOG       3U  //TODO Update AE                                                                 ///< Min queue required for data log (3)
-#define MIN_JOBS_NEEDED_FOR_SECTOR_0       4U  //TODO Update AE                                                                 ///< Min queue count needed to write all (4) records back in sector 0
+#define MIN_JOBS_NEEDED_FOR_DATA_LOG       3U                                                                   ///< Min queue required for data log (3)
+#define MIN_JOBS_NEEDED_FOR_SECTOR_0       4U                                                                   ///< Min queue count needed to write all (4) records back in sector 0
 
 // The clock frequency comes from HCLK_FREQ and it has to be rounded up to the
 // nearest number
@@ -57,9 +57,9 @@
 #define MAX_NUM_OF_SECTORS_FOR_LOG_DATA    3U                                                                   ///< Max number of sector (3 sectors)
 #define MAX_LOG_DATA_PER_SECTOR            (((BANK7_SECTOR1_END_ADDRESS + 1) - \
                                               BANK7_SECTOR1_START_ADDRESS) / MAX_JOB_DATA_SIZE_BYTES)           ///< Max log data per sector (512 for now)
-#define MAX_NUM_OF_EVENTS_IN_SECTOR3       (MAX_NUM_OF_SECTORS_FOR_LOG_DATA * MAX_LOG_DATA_PER_SECTOR)  //TODO Update AE        ///< Max number of accumulated logs in sector 3 (1536)
-#define MAX_NUM_OF_EVENTS_IN_SECTOR2       ((MAX_NUM_OF_SECTORS_FOR_LOG_DATA - 1) * MAX_LOG_DATA_PER_SECTOR)   //TODO Update AE  ///< Max number of accumulated logs in sector 2 (1024)
-#define MAX_NUM_OF_EVENTS_IN_SECTOR1       ((MAX_NUM_OF_SECTORS_FOR_LOG_DATA - 2) * MAX_LOG_DATA_PER_SECTOR)  //TODO Update AE   ///< Max number of accumulated logs in sector 1 (512)
+#define MAX_NUM_OF_EVENTS_IN_SECTOR3       (MAX_NUM_OF_SECTORS_FOR_LOG_DATA * MAX_LOG_DATA_PER_SECTOR)          ///< Max number of accumulated logs in sector 3 (1536)
+#define MAX_NUM_OF_EVENTS_IN_SECTOR2       ((MAX_NUM_OF_SECTORS_FOR_LOG_DATA - 1) * MAX_LOG_DATA_PER_SECTOR)    ///< Max number of accumulated logs in sector 2 (1024)
+#define MAX_NUM_OF_EVENTS_IN_SECTOR1       ((MAX_NUM_OF_SECTORS_FOR_LOG_DATA - 2) * MAX_LOG_DATA_PER_SECTOR)    ///< Max number of accumulated logs in sector 1 (512)
 
 // Data addresses and length in RTC RAM
 #define BOOTLOADER_FLAG_ADDRESS            0x00000000                                                           ///< Bootloader start address in RTC RAM (0)
@@ -1455,14 +1455,13 @@
         jobQueue [ myAddIndex ].startAddress    = (U32*)startAddress;
         jobQueue [ myAddIndex ].length          = length;
         jobQueue [ myAddIndex ].externalAddress = extAddress;
-    }
-    _enable_IRQ();
 
-
-    if ( extAddress == 0 )
-    {
-        memcpy ( jobQueue [ myAddIndex ].buffer, data, length );
+        if ( extAddress == 0 )
+        {
+            memcpy ( jobQueue [ myAddIndex ].buffer, data, length );
+        }
     }
+    _enable_IRQ();
 }
 
 /*************************************************************************