[NTK-660] NTK-660