Merge pull request #5035 from wjowsa/channel-analysis-fix-undefined