[NTK-859]

[NTK-859]