More i18n refactoring
Merge branch 'master' into merge_guides
Fix missed de-stringification of menu config and missed compilation issue.
Another missed de-stringification