Merge "Fix AttributeError in multinode jobs"