Merge "Use the same timeout as in the legacy job"