MP1-4242-FEAT-Watchdog_improvement