[IMP] Bugfix

Merged Jose Luis Zanotti requested to merge Bugfix into 12.0-Prod-Optimization

Merge request reports