Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r2a3a47ca90ad19851a30c52f6999a56d5f578783 -r5e2d30dcbd02f5eb737aee7ec45c63d868daf252
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 5e2d30dcbd02f5eb737aee7ec45c63d868daf252)
@@ -281,11 +281,17 @@
 
         // Don't interrupt pump control unless rate or mode is changing
         if ( ( dirFlowRate != targetBloodFlowRate ) || ( mode != bloodPumpControlMode ) )
-        {
-#ifndef NO_PUMP_FLOW_LIMITS
-            // Verify flow rate
-            if ( flowRate <= MAX_SET_BLOOD_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 of if the bypass flow limit has been enabled
+            if ( ( flowRate <= MAX_SET_BLOOD_FLOW_RATE ) || ( TRUE == byPassFlowLimit ) )
             {
                 resetBloodPumpRPMMovingAverage();
                 targetBloodFlowRate = dirFlowRate;