am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""

* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
  Revert "Watchdog: Improvement of debuggability"