[NTK-688]

[NTK-688]