LILY-329 convert formsets to fields
Merge branch 'feature/LILY-329-convert-formsets-to-fields' into develop