[NTK-686]

[NTK-686]