[NTK-676]

[NTK-676]