Update channel-type implementation to upstream spec as merged