Merge "Refactor JobRunner::run() by breaking it up a bit"