Dev#12992 custom fields

efalcy requested to merge dev#12992_custom_fields into WIP

Merge request reports