[NTK-486]

[NTK-486]