Merge pull request #1505 from tnull/2022-05-support-0conf-channeltype