Merge "fix BufferItem flatten/unflatten alignment"