Merge "Revert "Watchdog: Improvement of debuggability""