Merge "Force batching non-ACTIVE jobs."