INT-3465:Change as Artem's comment