fixes and l18n

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

Merge request reports