Merge pull request #1964 from TheBlueMatt/2023-01-no-debug-panics