[MERGED] Watchdog not firing

This topic has been merged into Watchdog not working as expectd.