15.0 merge

Merged Gastón Bertolani requested to merge 15.0-merge into 15.0

Merge request reports