Support batch execution
Merge branch 'batch_mode' into develop