Merge "Further Batch Refactor"