Merge pull request #14103 from annando/api-channel-list