Merge pull request #1845 from TheBlueMatt/2022-11-future-wake-fix