Merge "Move buffers pointer out of the control block"