[IMP] Bug fix

Merged Jose Luis Zanotti requested to merge T5425 into 15.0

Merge request reports