Batch support and connection robustness improvements