Merge "Fix two-node job configuration"