Merge "Remove InheritedChannel"