Merge "Implement new definition of IBufferHub"