Batch form work
Merge branch '0005-batch_process' into develop