Add limit to batched records
Merge remote-tracking branch 'leevigraham/master'
CS fixes and a BC nitpick