Incorporated review feedback.

16 jobs for !905 with 1097-arbitrary-quantities-in-es in 45 minutes and 24 seconds (queued for 2 seconds)
merge request