Merge "BufferHub{Buffer,Metadata}: Some other minor changes"