Merge branch '2755_zero_length_preallocate'