[NTK-819]

[NTK-819]