l18n & view fixes

Merged Luciano Ortiz requested to merge macro-dev into 11.0-prod

Merge request reports