[NTK-651]

[NTK-651]