Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rb308da77ce28d026457a1dc5728f5a625db7e43c -r027e4f8978bc86e9ce510ec317b38577eb941be1
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision b308da77ce28d026457a1dc5728f5a625db7e43c)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 027e4f8978bc86e9ce510ec317b38577eb941be1)
@@ -77,7 +77,7 @@
 static U32  fillStartTime = 0;                                                              ///< Time stamp for start of air trap fill.
 static U32  airPumpOnDelayStartTime = 0;                                                    ///< Air pump On start time.
 static U32  stopAirPumpStartTime = 0;                                                       ///< Stop air pump start time.
-// Air pump on delay after fill adjustment
+/// Air pump on delay after fill adjustment
 static const U32 AIR_PUMP_ON_DELAY_ADJUST_AFTER_FILL = ( AIR_PUMP_ON_DELAY_TIME_MS - ( 1 * MS_PER_SECOND ) );
 
 static BOOL airTrapValveOpenAtStartOfTreatement = FALSE;                                    ///< To Keep the fluid level high close to Air trap upper level during start of treatment
Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -r027e4f8978bc86e9ce510ec317b38577eb941be1
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 027e4f8978bc86e9ce510ec317b38577eb941be1)
@@ -255,7 +255,13 @@
         if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_HD_AC_POWER_LOST, hasPowerBeenLost ) )
         {
             clearAlarmCondition( ALARM_ID_HD_AC_POWER_LOST );
-            clearAlarmCondition( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT );
+
+            // Just to make sure we are not clearing the AC power lost in treatment alarm until DG powers up and not in
+            // POST mode, to avoid HD sending commands when DG is not yet ready.
+            if ( DG_MODE_INIT != getDGOpMode() )
+            {
+                clearAlarmCondition( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT );
+            }
         }
     }
 }