ALM-636 changed logic on how we queue jobs