Merge branch 'ab/i18n-scripts-basic'