Merge pull request #3123 from dunxen/2024-06-channelrefactor