[IMP] improve code

Merged Jose Luis Zanotti requested to merge RR-401 into 12.0-stage

Closes RR-401

Merge request reports