Fix watchdog calls()
Merge branch 'handler' into handler_testing