Dev#12992 Custom Fields

Ghislain Loas requested to merge master into dev#12992_custom_fields

Merge request reports