Merge branch 'sgen-job-distribution'