When saving state any nested children in the content fields div would be included, causing nested blocks states being saved in ancestors
Merge branch 'fixes/wrong-state-saving'