Merge pull request #2601 from TheBlueMatt/2023-09-117-alpha2