Merge pull request #1454 from TheBlueMatt/2022-04-fuzz-underflow