cleaning up batch reactor to manipulate buffers in batched resource chunks
Merge remote-tracking branch 'upstream/develop' into integration_testing