Merge "Make sure to mutex around job-set iteration"