[IMP] Change fields

Merged Jose Luis Zanotti requested to merge RAFFix into 12.0-stage

Merge request reports