[NTK-554]

[NTK-554]