Merge "Work on issue #29042642: Watchdog going off" into nyc-dev