Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r16c0f816fadfa45b51467c5292ba9ecf7a3914bd -r631df8130cb75938e0f496f0518ad52134bc5656
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 16c0f816fadfa45b51467c5292ba9ecf7a3914bd)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 631df8130cb75938e0f496f0518ad52134bc5656)
@@ -116,10 +116,13 @@
 
 static U32 dataPublishCounter;                                                                               ///< Used to schedule dialysate fill data publication to CAN bus.
 static DG_FILL_MODE_STATE_T fillState;                                                                       ///< Currently active fill state.
-static U32 dialysateFillStartTimeMS;                                                                          ///< Current time when starting to fill dialysate in milliseconds.
 static F32 reservoirBaseWeight;                                                                              ///< Fill reservoir base weight.
 static FILL_CONDITION_STATUS_T fillStatus;                                                                   ///< Fill condition status.
 
+static BOOL didFillRecoverFromPause;                                                                         ///< Flag to indicate whether the previous state was pause or not.
+static U32 dialysateFillStartTimeMS;                                                                         ///< Current time when starting to fill dialysate in milliseconds.
+static U32 dialysatePauseStartTimeMS;                                                                        ///< Current time when starting a pause during fill dialysate in milliseconds.
+static U32 dialysatePauseElapsedTimeMS;                                                                      ///< Elapsed time in pause during fill dialysate in milliseconds.
 static U32 concentrateTestStartTime;                                                                         ///< Starting time for concentrate test.
 static U32 concentratePrimingStartTime;                                                                      ///< Starting time for concentrate priming.
 static U32 flushBubblesStartTime;                                                                            ///< Starting time for flush bubbles.
@@ -146,7 +149,6 @@
 
 static U32 pumpSpeedIndex;                                                                                   ///< Index used to access the desired pump speed in roPumpFlushBubblesSpeed table.
 static BOOL havePauseActuatorsBeenSet;                                                                       ///< Flag to indicate the actuators have been set to pause for the first time.
-static BOOL didFillRecoverFromPause;                                                                         ///< Flag to indicate whether the previous state was pause or not.
 static FILL_ACID_BICARB_TYPES_T chemicalsTypes;                                                              ///< Chemicals Types (acid and bicarb).
 static DG_CHEMICALS_FILL_COND_CAL_RECORD_T chemicalsCond;                                                    ///< Chemicals fill conductivity records.
 static F32 acidMixRatio;                                                                                     ///< Acid conductivity mix ratio.
@@ -194,32 +196,32 @@
     getAcidConcentrateCalRecord( &acid );
     getBicarbConcentrateCalRecord( &bicarb );
 
+    acidConductivitySampleCount   = 0;
+    acidConductivityTotal         = 0.0F;
     acidMixRatio                  = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio;
+    averageAcidConductivity       = 0.0F;
+    averageBicarbConductivity     = 0.0F;
+    bicarbConductivitySampleCount = 0;
+    bicarbConductivityTotal       = 0.0F;
     bicarbMixRatio                = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
-    fillState                     = DG_FILL_MODE_STATE_TEST_INLET_WATER;
-    dialysateFillStartTimeMS      = 0;
-    dataPublishCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
-    reservoirBaseWeight           = 0.0F;
-    integratedVolumeML.data       = 0.0F;
-    didFMPCheckStart              = FALSE;
     concentrateTestStartTime      = 0;
-    acidConductivityTotal         = 0.0F;
-    bicarbConductivityTotal       = 0.0F;
-    conductivitySampleCount       = 0;
     concPumpPrimeStartTimeMS      = getMSTimerCount();
-    pumpSpeedIndex                = 0;
-    averageBicarbConductivity     = 0.0F;
-    averageAcidConductivity       = 0.0F;
-    pctDiffInConductivity         = 0.0F;
-    bicarbConductivitySampleCount = 0;
-    acidConductivitySampleCount   = 0;
-    totalBicarbConductivity       = 0.0F;
-    totalAcidConductivity         = 0.0F;
+    conductivitySampleCount       = 0;
+    dataPublishCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
+    dialysateFillStartTimeMS      = 0;
+    didFillRecoverFromPause       = FALSE;
+    didFMPCheckStart              = FALSE;
+    fillCPoConductivitySampleCnt  = 0;
+    fillState                     = DG_FILL_MODE_STATE_TEST_INLET_WATER;
     havePauseActuatorsBeenSet     = FALSE;
+    integratedVolumeML.data       = 0.0F;
+    pctDiffInConductivity         = 0.0F;
+    pumpSpeedIndex                = 0;
+    reservoirBaseWeight           = 0.0F;
     sumFillCPoConductivity        = 0.0F;
     sumFillRejRatio               = 0.0F;
-    fillCPoConductivitySampleCnt  = 0;
-    didFillRecoverFromPause       = FALSE;
+    totalAcidConductivity         = 0.0F;
+    totalBicarbConductivity       = 0.0F;
 }
 
 /*********************************************************************//**