Merge pull request #2414 from TheBlueMatt/2023-07-cut-116-rc