Merge pull request #2794 from TheBlueMatt/2023-12-cut-119