Merge "BufferPoolClient: avoid dereference null accessor" into main