Merge with watchdog 'niceness'