Provide batch limit and fix for #2090355