Split up watchdog for different events
Merge remote-tracking branch 'origin/master'