[NTK-638]

[NTK-638]