#4137 I18N Manager rework