Scale also the job counts
Merge branch 'v3/5654_p2' into v3/5909
Replace iterator with a diff.
Merge branch 'v3/5909' into branch_v3_2