PMO-2327: merging claims corrected for diamonds