Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r0237b2fc49d60b6602bac35ce43831b37f294c81 -ra25c11a9beb66c7292a184e3bc02a1a5ded5ed8a
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 0237b2fc49d60b6602bac35ce43831b37f294c81)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a25c11a9beb66c7292a184e3bc02a1a5ded5ed8a)
@@ -472,7 +472,6 @@
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE, artPres );
     }
-#endif
 
     // Check arterial pressure during treatment mode
     if ( MODE_TREA == getCurrentOperationMode() )
@@ -501,6 +500,7 @@
             clearAlarmCondition( ALARM_ID_ARTERIAL_PRESSURE_HIGH );
         }
     }
+#endif
 }
 
 /*********************************************************************//**
@@ -522,7 +522,6 @@
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres );
     }
-#endif
 
     // Check arterial pressure during treatment mode
     if ( MODE_TREA == getCurrentOperationMode() )
@@ -558,6 +557,7 @@
             clearAlarmCondition( ALARM_ID_VENOUS_PRESSURE_HIGH );
         }
     }
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r5070f8552a200e15dcc2ca0532db10fba9dc8c6b -ra25c11a9beb66c7292a184e3bc02a1a5ded5ed8a
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 5070f8552a200e15dcc2ca0532db10fba9dc8c6b)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a25c11a9beb66c7292a184e3bc02a1a5ded5ed8a)
@@ -46,9 +46,9 @@
 //    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
 //    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
     #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
-//    #define USE_FMD_FLOW_SENSOR             1           // Use FMD flow sensor (on HD) instead of FMD on DG
-//    #define USE_FMB_FLOW_SENSOR             1           // Use FMB flow sensor instead of flow estimation from pump speed/pressure/wearing
-//    #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode
+    #define USE_FMD_FLOW_SENSOR             1           // Use FMD flow sensor (on HD) instead of FMD on DG
+    #define USE_FMB_FLOW_SENSOR             1           // Use FMB flow sensor instead of flow estimation from pump speed/pressure/wearing
+    #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
     #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
     #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r0237b2fc49d60b6602bac35ce43831b37f294c81 -ra25c11a9beb66c7292a184e3bc02a1a5ded5ed8a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0237b2fc49d60b6602bac35ce43831b37f294c81)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision a25c11a9beb66c7292a184e3bc02a1a5ded5ed8a)
@@ -45,9 +45,15 @@
 
 #define DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN         100             ///< Patient connection sub-mode dialysate inlet pump flow rate in mL/min.
 
+#ifndef SKIP_PRIMING
 #define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         500             ///< Fill reservoir to this volume (in mL) to flush filter and lines.
 #define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      700             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
+#else
+#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         FILL_RESERVOIR_TO_VOLUME_ML
+#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
+#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
+#endif
 
 #define PRIMARY_HEATER_TARGET_TEMP_OFFSET               2.0             ///< Primary heater target temperature offset from trimmer heater temperature.