Merge branch 'ak/sh-setup-dot-source-i18n-fix'