Merge pull request #2373 from TheBlueMatt/2023-06-116-alpha