Merge pull request #918 from TheBlueMatt/2021-05-dup-claims