Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -re5006f5263e8540e730dd802016fef5973ecea4c -r99031535f5bc95d882f982b8f4cc5b74b825cf6a
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision e5006f5263e8540e730dd802016fef5973ecea4c)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 99031535f5bc95d882f982b8f4cc5b74b825cf6a)
@@ -265,10 +265,17 @@
         // Don't interrupt pump control unless rate or mode is changing
         if ( ( fabs( pwmDC - dialOutPumpPWMDutyCyclePct ) > NEARLY_ZERO ) || ( mode != dialOutPumpControlMode ) )
         {
-#ifndef NO_PUMP_FLOW_LIMITS
-            // Verify flow rate
-            if ( flowRate <= MAX_DIAL_OUT_FLOW_RATE )
+            BOOL byPassFlowLimit = FALSE;
+
+#ifndef _RELEASE_
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS ) )
+            {
+                byPassFlowLimit = TRUE;
+            }
 #endif
+
+            // Verify flow rate
+            if ( ( flowRate <= MAX_DIAL_OUT_FLOW_RATE ) || ( TRUE == byPassFlowLimit ) )
             {
                 resetDialOutFlowMovingAverage();
                 dopControlSignal = FALSE;
@@ -309,12 +316,15 @@
                 }
                 result = TRUE;
             }
-#ifndef NO_PUMP_FLOW_LIMITS
             else  // Requested flow rate too high
             {
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH, flowRate )
-            }
+#ifndef _RELEASE_
+                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+                {
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH, flowRate )
+                }
+            }
         }
     }