Merge pull request #1799 from TheBlueMatt/2022-10-heap-nerdsnipe