Merge watchdog into client.