Incorporated review feedback.

17 jobs for !905 with 1097-arbitrary-quantities-in-es in 69 minutes and 22 seconds (queued for 2 seconds)
merge request