Master

Merged Santiago Said requested to merge master into 11.0-stage

Merge request reports