Merge "Fix issue #27408705: Runtime restart: WATCHDOG KILLING SYSTEM PROCESS..." into nyc-dev