Merge pull request #1851 from TheBlueMatt/2022-11-fix-broken-futures-----again