Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r387a763cd2ca85cc5245f8e8953485299047f096 -rfae0f1d9a51c7a6a13d282440469663d9bfc7dec
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 387a763cd2ca85cc5245f8e8953485299047f096)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fae0f1d9a51c7a6a13d282440469663d9bfc7dec)
@@ -1008,7 +1008,6 @@
     PRE_TREATMENT_RESERVOIR_MGMT_STATE_T state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
-    DG_RESERVOIR_ID_T activeReservoir = getDGActiveReservoir();
 
     // If DG has not started yet, start DG
     if ( DG_MODE_STAN == dgOpMode )
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rafe402337b84d8843c6ab544643fc403cb382c43 -rfae0f1d9a51c7a6a13d282440469663d9bfc7dec
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision afe402337b84d8843c6ab544643fc403cb382c43)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision fae0f1d9a51c7a6a13d282440469663d9bfc7dec)
@@ -961,22 +961,21 @@
         if ( alarmStatus.alarmsState < NUM_OF_ALARM_PRIORITIES )
         {
 #ifndef _RELEASE_
-            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) )
-            {
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
-                setAlarmAudioState( ALARM_PRIORITY_HIGH,
-                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
-                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
-            }
-
-            else
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
                 setAlarmAudioState( alarmStatus.alarmsState,
                                     ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
                                     ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
             }
         }
+        else
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
+            setAlarmAudioState( ALARM_PRIORITY_HIGH,
+                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
+                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
+        }
     }
 }