Merge "TEMPORARY HACK: strace and fail on some timeout"