Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -rb18590ffa370d1e22f32a89510a0005fcb16408b
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
@@ -116,12 +116,14 @@
     if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
     {
         // ignore expired watchdog until after watchdog POST
-        if ( ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState ) ||
-             ( getCurrentOperationMode() != DG_MODE_INIT ) )
-        {
-#ifndef DEBUG_ENABLED
+        if ( getCurrentOperationMode() != DG_MODE_INIT )
+        {
+            /* DEBUG WARNING
+             * It may be necessary to comment out the following
+             * line to prevent the  alarm from occurring while
+             * debugging.
+             */
             activateAlarmNoData( ALARM_ID_DG_WATCHDOG_EXPIRED );
-#endif
         }
     }
 }