Added setting to allow setting data for frontend fields.
Added setting to allow setting data for frontend fields.
Fixed conflict
Merge branch 'frontend-fields'