Resolve #321 - Saving an entity form that contains a dynamic forms lead to partial saves
Resolve #312 - Structured Content and Pages do not save properly when changing the type or template