15.0 fix

Merged Luciano Ortiz requested to merge 15.0-fix into 15.0-stage

Merge request reports