Prevent BulkProcessor overflow
Merge pull request #1877 from dennishendriksen/master

Prevent BulkProcessor overflow