[NTK-362] NTK-362