HCOLL-197 - improved buffer resizing
Merge remote-tracking branch 'origin/master'