Merge pull request #2661 from TheBlueMatt/2023-10-dup-claim-chan-hang