PIM-1703: Add new hydrator and duplicate edit handler