Merge "Watchdog: Improvement of debuggability"