improve code

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

Merge request reports