Index: firmware/App/Monitors/Buttons.c
===================================================================
diff -u -r62a953813104dd3e3c462c6a771dbb90f5e28722 -r8b97a7e50a19f1c243559ad77c69b6a9e6ad067a
--- firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision 62a953813104dd3e3c462c6a771dbb90f5e28722)
+++ firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision 8b97a7e50a19f1c243559ad77c69b6a9e6ad067a)
@@ -62,7 +62,7 @@
 
 static OVERRIDE_U32_T dataOffButtonState;                           ///< Current off button state (overrideable).
 static BUTTON_STATE_T prevOffButtonState;                           ///< Previous state of off button.
-static BOOL offRequestAwaitingUserConfirmation;             ///< Flag indicates whether a power off request is pending user confirmation.
+static BOOL offRequestAwaitingUserConfirmation;                     ///< Flag indicates whether a power off request is pending user confirmation.
 static volatile U32 offRequestPendingTimer;                         ///< Timer counter for pending power off request.
 static volatile BOOL offButtonPressPending;                         ///< Flag indicates whether a confirmed power off request is pending execution.
 static volatile U32 offRequestPulseCount;                           ///< Power off sequence step counter.
@@ -367,7 +367,6 @@
         }
         else if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == responseStatus )
         {
-
             if ( TRUE == isCurrentOpModeOkToTurnOff() )
             {
                 POWER_OFF_WARNING_DATA_T data;
@@ -438,7 +437,7 @@
         if ( getStopButtonState() == BUTTON_STATE_PRESSED )
         {
             stopButtonPressPending = TRUE;
-//            stopButtonPendingTimer = getMSTimerCount();
+            stopButtonPendingTimer = getMSTimerCount();
             // Log stop button press
             SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BUTTON_STOP, BUTTON_STATE_PRESSED )
         }