INT-3460: fix as Artem's comments