[NTK-816] NTK-816