Batch UI Index in place
Merge branch 'batch_ui' into development