[NTK-827]

[NTK-827]