Merge pull request #1737 from TheBlueMatt/2022-09-future-trait