[IMP] Bugfix

Merged Jose Luis Zanotti requested to merge 12.0-bugfix into 12.0

Merge request reports