Fix form delete and add methods.
Merge branch 'fix-form-delete' into develop