[IMP] Improve Code

Merged Jose Luis Zanotti requested to merge T2590 into 15.0-stage

Merge request reports