Merge branch 'va/i18n-misc-updates' into maint