Issue #2186155 by DamienMcKenna, grahamC, JeroenT: Resolved problems when saving an entity directly rather than via entity form.