Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -403,9 +403,8 @@
     BOOL result = FALSE;
 
     // If DG is in standby mode or in the solo mode and the standby mode is in Idle state, request DG flush
-    if ( ( DG_MODE_STAN == getCurrentOperationMode() && DG_STANDBY_MODE_STATE_IDLE == standbyState ) || DG_MODE_SOLO == getCurrentOperationMode() )
+    if ( ( DG_MODE_STAN == getCurrentOperationMode() && DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
     {
-#ifndef DISABLE_CAP_SWITCHES
         DG_CMD_RESPONSE_T cmdResponse;
 
         cmdResponse.commandID  = DG_CMD_START_FLUSH;
@@ -414,12 +413,16 @@
 
         if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
         {
-            cmdResponse.rejected   = TRUE;
-            cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
-                                                                                        REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                cmdResponse.rejected   = TRUE;
+                cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
+                                                                                            REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
+            }
         }
         else
-#endif
         {
             pendingStartDGFlushRequest = TRUE;
             result                     = TRUE;
@@ -445,7 +448,6 @@
     // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect
     if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
     {
-#ifndef DISABLE_CAP_SWITCHES
         DG_CMD_RESPONSE_T cmdResponse;
 
         cmdResponse.commandID  = DG_CMD_START_HEAT_DISINFECT;
@@ -454,13 +456,16 @@
 
         if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
         {
-            cmdResponse.rejected   = TRUE;
-            cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
-                                                                                        REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
-
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                cmdResponse.rejected   = TRUE;
+                cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
+                                                                                            REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
+            }
         }
         else
-#endif
         {
             pendingStartDGHeatDisinfectRequest = TRUE;
             status                             = TRUE;
@@ -497,9 +502,14 @@
         // When chemical disinfect is about to be started, both caps must be closed
         if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
         {
-            cmdResponse.rejected   = TRUE;
-            cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
-                                                                                        REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                cmdResponse.rejected   = TRUE;
+                cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
+                                                                                            REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
+            }
        }
         else
 #endif