Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rf10c653a13f97ae3d220e16f7ff1a9558606b56a -r5f1388ca0f6672b9ab90eef649de8dc921c9beb2
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision f10c653a13f97ae3d220e16f7ff1a9558606b56a)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 5f1388ca0f6672b9ab90eef649de8dc921c9beb2)
@@ -313,7 +313,7 @@
                  ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 resetChemicalUsedVolumeML( ACID );
-                setThisFisrtFillFlag( TRUE );                                 // indicates bottles need prime
+                setThisFirstFillFlag( TRUE );                                 // indicates bottles need prime
                 activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
                 activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
@@ -322,7 +322,7 @@
                  ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 resetChemicalUsedVolumeML( BICARB );
-                setThisFisrtFillFlag( TRUE );
+                setThisFirstFillFlag( TRUE );
                 activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
                 activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rf10c653a13f97ae3d220e16f7ff1a9558606b56a -r5f1388ca0f6672b9ab90eef649de8dc921c9beb2
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f10c653a13f97ae3d220e16f7ff1a9558606b56a)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 5f1388ca0f6672b9ab90eef649de8dc921c9beb2)
@@ -535,7 +535,7 @@
  * @param flag to TRUE if prime is needed otherwise FALSE
  * @return none
  *************************************************************************/
-void setThisFisrtFillFlag( BOOL flag )
+void setThisFirstFillFlag( BOOL flag )
 {
     fillStatus.isThisFirstFill = flag;
 }
@@ -948,7 +948,7 @@
              ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
         {
             setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
-            setThisFisrtFillFlag( TRUE );
+            setThisFirstFillFlag( TRUE );
             resetChemicalUsedVolumeML( BICARB );
             resetChemicalUsedVolumeML( ACID );
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConduSPerCM, bicarbNormalConduSPerCM );  // trigger replace bottles alarm #1
Index: firmware/App/Modes/ModeFill.h
===================================================================
diff -u -r1a219888b8fda9dcbbfc51fbe76490ee247f5f14 -r5f1388ca0f6672b9ab90eef649de8dc921c9beb2
--- firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision 1a219888b8fda9dcbbfc51fbe76490ee247f5f14)
+++ firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision 5f1388ca0f6672b9ab90eef649de8dc921c9beb2)
@@ -66,7 +66,7 @@
 F32  getAvgFillTemperature( void );
 F32  getLastFillTemperature( void );
 
-void setThisFisrtFillFlag( BOOL flag );  // indicates bottles need prime when set to TRUE
+void setThisFirstFillFlag( BOOL flag );  // indicates bottles need prime when set to TRUE
 void resetFillStatusParameters( void );
 
 BOOL isThisTheFirstFill( void );
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r1a219888b8fda9dcbbfc51fbe76490ee247f5f14 -r5f1388ca0f6672b9ab90eef649de8dc921c9beb2
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 1a219888b8fda9dcbbfc51fbe76490ee247f5f14)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 5f1388ca0f6672b9ab90eef649de8dc921c9beb2)
@@ -302,14 +302,6 @@
         // The empty bottle alarms are active set the empty bottle alarm to TRUE.
         handleEmptyBottleFlag = TRUE;
     }
-    else if ( ( TRUE == handleEmptyBottleFlag ) &&
-              ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) &&
-              ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
-    {
-        // The empty bottle flag is TRUE and alarms are not active anymore. This means the user has presumably inserted the new acid and
-        // bicarb bottles and has hit resume. Since HD is on pause, DG has to request fill by itself.
-        requestNewOperationMode( DG_MODE_FILL );
-    }
 
     return result;
 }