[NTK-849] NTK-849