[NTK-639]

[NTK-639]