Merge pull request #2891 from TheBlueMatt/2024-02-no-ahash