bugfix: watchdog socket data
Merge branch 'master' into dev