Batch Entities - changes after merging with development.