Allow client-side channel buffer merges, and associated changes.