Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43