Merge "Add back resize buffer"