Bug fix

Merged Santiago Said requested to merge BugFix into 8.0-stage

Merge request reports