Make standard direct calls to merge from custom persistence handler work appropriately with cloning