Merge pull request #2077 from dunxen/2023-02-splitchannelstate