Merge pull request #2592 from TheBlueMatt/2023-09-117-alpha