[NTK-824]

[NTK-824]