[EXEC-34] Race condition prevent watchdog working using ExecuteStreamHandler - Patch submitted by Kristian Rosenvold