Merge pull request #912 from TheBlueMatt/2021-05-more-chan-info