Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r6abc34804f57c48e9faf927e8e788d0de757026c -r449284762afeab963030f9eccd6cfded649abbad
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 6abc34804f57c48e9faf927e8e788d0de757026c)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 449284762afeab963030f9eccd6cfded649abbad)
@@ -42,25 +42,26 @@
     SW_CONFIG_DISABLE_ACCELS,                                                                                  ///< Software configuration disable accelerometers.
     SW_CONFIG_DISABLE_CAL_CHECK,                                                                               ///< Software configuration disable calibration check.
     SW_CONFIG_DISABLE_HEATERS_MONITOR,                                                                         ///< Software configuration disable heaters monitor.
-    SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR,
+    SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR,                                                                      ///< Software configuration disable drain pump monitor.
     SW_CONFIG_DISABLE_RO_PUMP_MONITOR,                                                                         ///< Software configuration disable RO pump monitor.
     SW_CONFIG_DISABLE_RO_RATIO_CHECK,                                                                          ///< Software configuration disable RO ratio check
     SW_CONFIG_DISABLE_COND_SENSOR_CHECK,                                                                       ///< Software configuration disable conductivity sensor check.
-    SW_CONFIG_DISABLE_WATER_QUALITY_CHECK,
-    SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL,
-    SW_CONFIG_DISABLE_HEATERS_EFFICIENCY,
-    SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK,
-    SW_CONFIG_DISABLE_CONC_PUMPS,
-    SW_CONFIG_DISABLE_CAPS_MONITOR,
-    SW_CONFIG_DISABLE_UV_REACTORS,
-    SW_CONFIG_DISABLE_ACID_ALARMS,
-    SW_CONFIG_DISABLE_BICARB_ALARMS,
-    SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM,
-    SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST,
-    SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST,
-    SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM,
-    SW_CONFIG_DISABLE_MIXING_IN_FILL,
-    SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM,
+    SW_CONFIG_DISABLE_WATER_QUALITY_CHECK,                                                                     ///< Software configuration disable water quality check.
+    SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL,                                                         ///< Software configuration disable flow vs. load cell check in fill.
+    SW_CONFIG_DISABLE_HEATERS_EFFICIENCY,                                                                      ///< Software configuration disable heaters efficiency.
+    SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK,                                                            ///< Software configuration disable disinfect conductivity check.
+    SW_CONFIG_DISABLE_CONC_PUMPS,                                                                              ///< Software configuration disable concentrate pumps.
+    SW_CONFIG_DISABLE_CAPS_MONITOR,                                                                            ///< Software configuration disable cap monitor.
+    SW_CONFIG_DISABLE_UV_REACTORS,                                                                             ///< Software configuration disable UV reactors.
+    SW_CONFIG_DISABLE_ACID_ALARMS,                                                                             ///< Software configuration disable acid alarms.
+    SW_CONFIG_DISABLE_BICARB_ALARMS,                                                                           ///< Software configuration disable bicarb alarms.
+    SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM,                                                                     ///< Software configuration disable empty bottle alarms.
+    SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST,                                                                ///< Software configuration disable bicarb conductivity test.
+    SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST,                                                                  ///< Software configuration disable acid conductivity test.
+    SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM,                                                                  ///< Software configuration disable concentrate pumps speed alarm.
+    SW_CONFIG_DISABLE_MIXING_IN_FILL,                                                                          ///< Software configuration disable mixing in fill.
+    SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM,                                                               ///< Software configuration disable temperature sensors alarm.
+    SW_CONFIG_ENABLE_V3_SYSTEM,                                                                                ///< Software configuration enable V3 system.
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
 #endif
Index: RTC.c
===================================================================
diff -u -r0009d6f83716ef0906bc5aa88b9668f0965a4f31 -r449284762afeab963030f9eccd6cfded649abbad
--- RTC.c	(.../RTC.c)	(revision 0009d6f83716ef0906bc5aa88b9668f0965a4f31)
+++ RTC.c	(.../RTC.c)	(revision 449284762afeab963030f9eccd6cfded649abbad)
@@ -1396,6 +1396,8 @@
 static RTC_SELF_TEST_STATE_T handleSelfTestCheckAccuracy( void )
 {
     RTC_SELF_TEST_STATE_T result = RTC_SELF_TEST_STATE_CHECK_ACCURACY;
+
+#ifndef BOARD_WITH_NO_HARDWARE
     BOOL isStatusOk = serviceRTC( txBuffer, rxBuffer, RTC_GENERAL_BUFFER_LENGTH );
 
     if ( ( TRUE == isStatusOk ) && ( rxBuffer[ RTC_SECONDS_INDEX ] != RTCPreviousSecond ) )
@@ -1426,6 +1428,10 @@
             SET_ALARM_WITH_2_U32_DATA( alarm, (U32)elapsedFPGATime, (U32)elapsedTime );
         }
     }
+#else
+    result            = RTC_SELF_TEST_STATE_COMPLETE;
+    RTCSelfTestResult = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }