Index: firmware/App/DGCommon.h
===================================================================
diff -u -r4790fb46181f78a19f0a557b0e9688cc03a74e97 -r992dce16d63424ddd30fe9ac2f819e9a53b21977
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 4790fb46181f78a19f0a557b0e9688cc03a74e97)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        11
+#define DG_VERSION_BUILD        13
 
 // ********** build switches **********
 
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r6818dafc0839d6e8585f5e6f35013f539ad5a0ed -r992dce16d63424ddd30fe9ac2f819e9a53b21977
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 6818dafc0839d6e8585f5e6f35013f539ad5a0ed)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
@@ -22,9 +22,9 @@
 #include "ModeFault.h"
 #include "ModeFill.h"
 #include "ModeFlush.h"
+#include "ModeGenIdle.h"
 #include "ModeHeatDisinfect.h"
 #include "ModeInitPOST.h"
-#include "ModeRecirculate.h"
 #include "ModeService.h"
 #include "ModeSolo.h"
 #include "ModeStandby.h"
@@ -54,15 +54,15 @@
 /// This matrix determines legal transitions from one mode to another.
 static const DG_OP_MODE_T MODE_TRANSITION_TABLE[ NUM_OF_DG_MODES - 1 ][ NUM_OF_DG_MODES - 1 ] =
 {
-// from     to->           FAULT        SERVICE         INIT         STANBY       STBY-SOLO      RE-CIRC       FILL          DRAIN         FLUSH         HEAT DIS     CHEM DIS
+// from     to->           FAULT        SERVICE         INIT         STANBY       STBY-SOLO      GEN-IDLE       FILL          DRAIN         FLUSH         HEAT DIS     CHEM DIS
         /* FAUL     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* SERV     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* INIT     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_INIT, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
-        /* STAN     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_CIRC, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM },
+        /* STAN     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_GENE, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM },
         /* SOLO     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM /*DG_MODE_NLEG*/ }, // TODO for testing only
-        /* CIRC     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_CIRC, DG_MODE_FILL, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
-        /* FILL     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_CIRC, DG_MODE_FILL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
-        /* DRAI     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_CIRC, DG_MODE_NLEG, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
+        /* GENE     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
+        /* FILL     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
+        /* DRAI     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_NLEG, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* FLUS     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_NLEG, DG_MODE_NLEG },
         /* HEAT     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_HEAT, DG_MODE_NLEG },
         /* CHEM     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_CHEM }
@@ -104,7 +104,7 @@
     initInitAndPOSTMode();
     initStandbyMode();
     initSoloMode();
-    initRecirculateMode();
+    initGenIdleMode();
     initFillMode();
     initDrainMode();
     initFlushMode();
@@ -166,8 +166,8 @@
             currentSubMode = execSoloMode();
             break;
 
-        case DG_MODE_CIRC:
-            currentSubMode = execRecirculateMode();
+        case DG_MODE_GENE:
+            currentSubMode = execGenIdleMode();
             break;
 
         case DG_MODE_FILL:
@@ -314,8 +314,8 @@
         case DG_MODE_SOLO:
             transitionToSoloMode();
             break;
-        case DG_MODE_CIRC:
-            transitionToRecirculateMode();
+        case DG_MODE_GENE:
+            transitionToGenIdleMode();
             break;
         case DG_MODE_FILL:
             transitionToFillMode();
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r47c41046beba8affaaaa13a4f222a7b99bd193f1 -r992dce16d63424ddd30fe9ac2f819e9a53b21977
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 47c41046beba8affaaaa13a4f222a7b99bd193f1)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
@@ -107,7 +107,7 @@
     SW_FAULT_ID_HEAT_DISINFECT_INVALID_EXEC_STATE,
     SW_FAULT_ID_INVALID_DG_RESERVOIR_SELECTED,
     SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_RECIRC_MODE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_GEN_IDLE_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE,                          // 80
     SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_SOLO_MODE_INVALID_EXEC_STATE,
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r233034b67edaee48012bf9a5478327519e0256bb -r992dce16d63424ddd30fe9ac2f819e9a53b21977
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 233034b67edaee48012bf9a5478327519e0256bb)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
@@ -25,8 +25,8 @@
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFlush.h"
+#include "ModeGenIdle.h"
 #include "ModeStandby.h"
-#include "ModeRecirculate.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -1572,11 +1572,11 @@
 
         memcpy( &startingTreatment, message->payload, sizeof( U32 ) );
 
-        if ( DG_MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment )
+        if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( TRUE == startingTreatment ) )
         {
             result = requestDGStart();
         }
-        else if ( DG_MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment )
+        else if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( FALSE == startingTreatment ) )
         {
             result = requestDGStop();
         }
@@ -2909,11 +2909,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( ( BOOL )payload.state.u32 )
         {
-            requestConcentratePumpsOn( ( CONCENTRATE_PUMPS_T )payload.index );
+            requestConcentratePumpOn( ( CONCENTRATE_PUMPS_T )payload.index );
         }
         else
         {
-            requestConcentratePumpsOff( ( CONCENTRATE_PUMPS_T )payload.index );
+            requestConcentratePumpOff( ( CONCENTRATE_PUMPS_T )payload.index );
         }
     }
 
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r47c41046beba8affaaaa13a4f222a7b99bd193f1 -r992dce16d63424ddd30fe9ac2f819e9a53b21977
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 47c41046beba8affaaaa13a4f222a7b99bd193f1)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
@@ -284,14 +284,7 @@
 
     if ( task < NUM_OF_TASKS )
     {
-        if ( OVERRIDE_KEY == watchdogTaskCheckedIn[ task ].override )
-        {
-            result = (BOOL)watchdogTaskCheckedIn[ task ].ovData;
-        }
-        else
-        {
-            result = (BOOL)watchdogTaskCheckedIn[ task ].data;
-        }
+        result = (BOOL)getU32OverrideValue( &watchdogTaskCheckedIn[ task ] );
     }
     else
     {