One commonly applicable comment: redelivery logic should always have an upper bound on how many items are redelivered at a time to avoid that the herd thunders over the remoting plains and destroys everything.