Merge pull request #893 from TheBlueMatt/2021-04-features-chanman