Merge "Add/use watchdog with standard timeout" into main