[NTK-624]

[NTK-624]