validation for empty category children
Merge branch 'origin/form-type-patch'