merge fix watchdog restart issue from 6.0