[NTK-354] NTK-354