Merge "Move core data structure of DetachedBuffer into BufferNode"