Merge pull request #6723 from knarrff/channel_analysis__base-channel