Convert legacy form to new form editor

+1