Merge "Fix two-node jobs"