Merge "Revert "Fix watchdog""