Dev#12992 Custom Fields

Laurent requested to merge dev#12992_custom_fields into WIP

Merge request reports