Merge "Fix freeId() failed in ~BufferNode"