Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r64807fd74f2b3b2cb7a08f8045a43677b2f2f820 -r92a1989e9c81d5e6f3d1a79430716b668dd5d31f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 64807fd74f2b3b2cb7a08f8045a43677b2f2f820)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 92a1989e9c81d5e6f3d1a79430716b668dd5d31f)
@@ -7760,7 +7760,16 @@
      sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-void handleHDRTCstatusOverrideRequest( MESSAGE_T * message )
+/*********************************************************************//**
+ * @brief
+ * The handleHDRTCControlReg1StatusOverrideRequest function handles a
+ * request to override RTC control register 1.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleHDRTCControlReg1StatusOverrideRequest( MESSAGE_T * message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -7771,17 +7780,48 @@
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetRTCstatus( payload.state.u32 );
+            result = testSetRTCCtlReg1Status( payload.state.u32 );
         }
         else
         {
-            result = testResetRTCstatus();
+            result = testResetRTCCtlReg1Status();
         }
     }
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleHDRTCControlReg3StatusOverrideRequest function handles a
+ * request to override RTC control register 3.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleHDRTCControlReg3StatusOverrideRequest( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
 
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetRTCCtlReg3Status( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetRTCCtlReg3Status();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/