15.0 fixes

Merged Sergio Gomez requested to merge 15.0-fixes into 15.0-stage

Merge request reports