[NTK-337] NTK-337