fixed config for watchdog.
Merge branch 'test' into dev