Merge pull request #14097 from annando/enable-user-defined-channel