[NTK-495]

[NTK-495]