[IMP] Bugfix

Merged Jose Luis Zanotti requested to merge TOM-372 into 15.0

Closes TOM-372

Merge request reports