[NTK-619]

[NTK-619]