Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3ceb067da2066eeca3634b5a591ae9e32a7d4725 -r8b5dce60e7d76c9e13f22ca151642e61d6160ae8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3ceb067da2066eeca3634b5a591ae9e32a7d4725)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8b5dce60e7d76c9e13f22ca151642e61d6160ae8)
@@ -587,7 +587,7 @@
     for ( i = 0; i < MAX_TOP_LEVEL_SN_CHARS; i++ )
     {
         // NOTE: A local variable was created to avoid system.topLevelSN in the messages list
-        // NOTE: For loop was used instead of memcpy to ensure it is not parsed in the messages list script
+        // NOTE: For loop was used instead of memory copy to ensure it is not parsed in the messages list script
         localTopLevelSN.topLevelSN[ i ] = system.topLevelSN[ i ];
     }
 
@@ -1790,8 +1790,8 @@
  *************************************************************************/
 void handleSetROOnlyMode( MESSAGE_T* message )
 {
-    BOOL result;
     UI_RESPONSE_PAYLOAD_T uiResponse;
+    BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_DG_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH;
     BOOL accepted                          = FALSE;
 
@@ -1815,12 +1815,14 @@
                     break;
 
                 default:
+                    result    = isROOnlyModeEnabled();
                     rejReason = REQUEST_REJECT_REASON_DG_RO_ONLY_MODE_DG_BUSY;
                     break;
             }
         }
         else
         {
+            result    = isROOnlyModeEnabled();
             rejReason = REQUEST_REJECT_REASON_DG_RO_ONLY_MODE_INVALID_PARAMETER;
         }
     }