Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3d211bbf5607fb42f003d074caa58f75069774e9 -r2f2f6378e24cc266a5b5e595af2e65cd04dcc72d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3d211bbf5607fb42f003d074caa58f75069774e9)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2f2f6378e24cc266a5b5e595af2e65cd04dcc72d)
@@ -5178,10 +5178,12 @@
  *************************************************************************/
 void handleRebootNowRequest( MESSAGE_T *message )
 {
-    BOOL result = (0 == message->hdr.payloadLen);
+    BOOL result = FALSE;
 
-    if (result)
+    if ( 0 == message->hdr.payloadLen )
     {
+        result = TRUE;
+
         // Trigger a software reset.
         systemREG1->SYSECR = (0x2) << 14;
     }
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r33c227865b5060922524162df4add41e4536a6d5 -r2f2f6378e24cc266a5b5e595af2e65cd04dcc72d
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 33c227865b5060922524162df4add41e4536a6d5)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2f2f6378e24cc266a5b5e595af2e65cd04dcc72d)
@@ -535,9 +535,9 @@
 // MSG_ID_DG_CHEM_DISINFECT_ACID_OVERRIDE
 void handleTestChemDisinfectAcidOverride( MESSAGE_T* message );
 
-// MSG_ID_FW_SET_ENTER_BOOTLOADER
-// MSG_ID_FW_ENTER_BOOTLOADER_NOW
-// MSG_ID_FW_REBOOT_NOW
+// MSG_ID_DG_SET_ENTER_BOOTLOADER
+// MSG_ID_DG_ENTER_BOOTLOADER_NOW
+// MSG_ID_DG_REBOOT_NOW
 void handleRebootNowRequest( MESSAGE_T *message );
 
 /**@}*/