[IMP] Bugfix

Merged Jose Luis Zanotti requested to merge SE-1062 into 12.0-Prod

Closes SE-1062

Merge request reports