Merge branch 'ab/i18n-basic'