MSS-26 watchdog fix