Merge branch 'hotfix/publish-bug'
refactored l10n into a class
Merge branch 'hotfix/l10n-bug' into develop