Merge "Properly adjust pending job count." into sc-dev