Merge pull request #1495 from TheBlueMatt/2022-04-all-claimables