Merge pull request #2808 from TheBlueMatt/2023-12-fuzzing-fixes-1