Merge latest code from previous release

Form preview

:
New fieldset
This fieldset is empty. Drag a form element into it.