Merge pull request #1707 from TheBlueMatt/2022-09-no-global-features