Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r15f9827c863812cfd1f891d22342103fe9a72abc -re5006f5263e8540e730dd802016fef5973ecea4c
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision e5006f5263e8540e730dd802016fef5973ecea4c)
@@ -123,7 +123,7 @@
 #define BP_FLOW_WEAR_A_TERM                 0.000000001     ///< A term used for wear portion of alpha flow coefficient.
 #define BP_FLOW_WEAR_B_TERM                 0.00055         ///< B term used for wear portion of alpha flow coefficient.
 #define BP_MAX_ROTOR_COUNT_FOR_WEAR         25000           ///< Maximum rotor count for determining wear of the cartridge (negligible affect beyond this threshold).
-#define DATA_PUBLISH_COUNTER_START_COUNT    9               ///< Data publish counter start count.
+#define DATA_PUBLISH_COUNTER_START_COUNT    20              ///< Data publish counter start count.
 
 /// Enumeration of blood pump controller states.
 typedef enum BloodPump_States
@@ -327,12 +327,16 @@
                 }
                 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_BLOOD_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_BLOOD_FLOW_SET_TOO_HIGH, flowRate )
+                }
+            }
         }
     }