CLOUD-131 & 128, i18n related