Merge pull request #2148 from TheBlueMatt/2023-04-claim-from-closed