Merge "BufferHubQueue Cleanup"