Index: NVDataMgmt.c
===================================================================
diff -u -r9d9e5e0004ab2aa094d035f2ee7ad2bdd0820a54 -ra708dd9b0f3840394b377fae9b7a89dc469bd268
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 9d9e5e0004ab2aa094d035f2ee7ad2bdd0820a54)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision a708dd9b0f3840394b377fae9b7a89dc469bd268)
@@ -1533,6 +1533,21 @@
 
     return status;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The resetNVDataMgmtPostState function resets the NV data management POST
+ * state.
+ * @details Inputs: none
+ * @details Outputs: nvDataMgmtSelfTestState
+ * @param none
+ * @return none
+ *************************************************************************/
+void resetNVDataMgmtPostState( void )
+{
+    nvDataMgmtSelfTestState = NVDATAMGMT_SELF_TEST_STATE_START;
+}
+
 #endif
 /*********************************************************************//**
  * @brief
Index: NVDataMgmt.h
===================================================================
diff -u -r6abc34804f57c48e9faf927e8e788d0de757026c -ra708dd9b0f3840394b377fae9b7a89dc469bd268
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 6abc34804f57c48e9faf927e8e788d0de757026c)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision a708dd9b0f3840394b377fae9b7a89dc469bd268)
@@ -139,6 +139,8 @@
 
 void benignPolynomialCalRecord( POLYNOMIAL_CAL_PAYLOAD_T* record );
 
+void resetNVDataMgmtPostState( void );
+
 /**@}*/
 
 #endif
Index: RTC.c
===================================================================
diff -u -r823005b0a8c0d3fcdef9d914f991924d305491f6 -ra708dd9b0f3840394b377fae9b7a89dc469bd268
--- RTC.c	(.../RTC.c)	(revision 823005b0a8c0d3fcdef9d914f991924d305491f6)
+++ RTC.c	(.../RTC.c)	(revision a708dd9b0f3840394b377fae9b7a89dc469bd268)
@@ -721,7 +721,6 @@
     alarm = ALARM_ID_HD_RTC_CONFIG_ERROR;
 #endif
 
-#ifndef DISABLE_RTC_CONFIG
     U16 controlReg1 = rxBuffer[ RTC_REG_1_INDEX ];
     U16 controlReg2 = rxBuffer[ RTC_REG_2_INDEX ];
     U16 controlReg3 = rxBuffer[ RTC_REG_3_INDEX ];
@@ -772,7 +771,7 @@
 #endif
         hasTestPassed = FALSE;
     }
-#endif
+
     return hasTestPassed;
 }
 
@@ -1436,7 +1435,19 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The resetRTCPostState function resets the RTC self test state
+ * @details Inputs: none
+ * @details Outputs : RTCSelfTestState
+ * @return none
+ *************************************************************************/
+void resetRTCPostState( void )
+{
+    RTCSelfTestState = RTC_SELF_TEST_STATE_START;
+}
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: RTC.h
===================================================================
diff -u -r54a9bd09d6714d7faaa186959988a75ef3b83557 -ra708dd9b0f3840394b377fae9b7a89dc469bd268
--- RTC.h	(.../RTC.h)	(revision 54a9bd09d6714d7faaa186959988a75ef3b83557)
+++ RTC.h	(.../RTC.h)	(revision a708dd9b0f3840394b377fae9b7a89dc469bd268)
@@ -83,6 +83,8 @@
 
 BOOL testSetStopRTC( void );
 
+void resetRTCPostState( void );
+
 /**@}*/
 
 #endif