Merge "Add garbage collecion function to BufferHubService"