[IMP] Temp Fix

Merged Jose Luis Zanotti requested to merge TMPFix into 12.0

Merge request reports