Merge pull request #985 from TheBlueMatt/2021-06-auto-chan-fee-updates