[NTK-835]

[NTK-835]