Merge pull request #1717 from TheBlueMatt/2022-09-req-features-in-handlers