Merge "Refactored duplicated code into JobRunner.php"