[NTK-632]

[NTK-632]