Merge branch 'ab/i18n-envsubst-doc-fix'