Merge branch 'js/i18n-scripts'