INT-2856: change as Artem's comments