HCOLL-167 finally got chunking to work but it ugly - requires a bit of refactoring.
Merge remote-tracking branch 'origin/master'