Merge pull request #2620 from TheBlueMatt/2023-09-cut-0.0.117