Master

Merged Laureano Kloss requested to merge master into 12.0-stage

Merge request reports