[NTK-817]

[NTK-817]