Merge "Add constraints and timeouts from file in single step"