i18n text
Merge branch 'dev' into public-cloud