Issue #1623536 by DamienMcKenna, Sergii, mukhsim: UUID changes how the entity object is saved.