* commit '525322ecbab1502586d378e7065edc402abc63bf': Support different watchdog timeouts for different entities