Fixing

Merged Santiago Said requested to merge fixing into 12.0-stage

Merge request reports