merge 15.0-stage -> 15.0

Merged Luciano Ortiz requested to merge 15.0-stage into 15.0

Merge request reports