Merge "Move BufferNode off ionbuffer"