Merge branch 'watchdog' into 'master'

watchdog rewrite

See merge request !878
12 jobs for master
in 16 minutes and 47 seconds and was queued for 5 seconds
Scheduled