Merge pull request #1988 from TheBlueMatt/2023-01-limited-chans