Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8 -rfcde872fd7bdadac4db7d2e8903974bfbbc2b125
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fcde872fd7bdadac4db7d2e8903974bfbbc2b125)
@@ -8094,11 +8094,8 @@
 {
     BOOL result = FALSE;
 
-    // verify payload length
-    if ( 0 == message->hdr.payloadLen )
-    {
-        result = setBootloaderFlag();
-    }
+    // For now, there's no flag to set to stay in bootloader,
+    // this might change in the future, so leave message.
 
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -8130,7 +8127,8 @@
 /*********************************************************************//**
  * @brief
  * The handleEnterBootloaderNowRequest function handles a
- * request immediately jump to the bootloader application.
+ * request to reboot the system. A software reset will cause the bootloader
+ * to stay active for XX seconds.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
@@ -8146,7 +8144,7 @@
     if (result)
     {
         // Jump to the bootloader, there is no coming back from this.
-        startBootloader();
+        rebootSystemNow();
     }
 }