Merged unit-test-fix (aka watchdog delay bug)