Merge pull request #2537 from TheBlueMatt/2023-08-one-less-feature-dep