Merge pull request #3091 from TheBlueMatt/2024-06-channel_state_ser