KN-5867 Localization engine improvements