Merge "Fix CommandRunner hanging when exception occurs"