[IMP] Change fields

Merged Jose Luis Zanotti requested to merge SE-1184 into 12.0-Prod-Optimization

Closes SE-1184

Merge request reports