Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8b09199bae9870a8d63d4be9636ef66c849f8531 -rc851d640df6889c1ac5b8b1a66340376463d0702
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8b09199bae9870a8d63d4be9636ef66c849f8531)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c851d640df6889c1ac5b8b1a66340376463d0702)
@@ -7761,4 +7761,68 @@
      sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @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;
+
+    // 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 = testSetRTCCtlReg1Status( payload.state.u32 );
+        }
+        else
+        {
+            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 );
+}
+
 /**@}*/