Merge pull request #2602 from TheBlueMatt/2023-09-descriptor-hash