[NTK-826]

[NTK-826]