[NTK-838]

[NTK-838]