Merge pull request #984 from TheBlueMatt/2021-06-more-chan-data