Merge "Never force batch expedited jobs." into sc-dev