Merge "Add observer to bufferpool clients"