Simplify batch usage

Xavier Andrade requested to merge simplify_batches into develop Apr 14, 2019