Merge "Improve watchdog logging" into main