Merge pull request #1743 from tnull/2022-09-channel-events