Merge pull request #3089 from TheBlueMatt/2024-06-channel_state-module