OI-1055

Applied localization