Use customized fieldset when generating fieldsets
Merge branch 'feature/fieldsets-fix' into develop