[IMP] TMP Fix

Merged Jose Luis Zanotti requested to merge T6729 into 12.0

Merge request reports