[NTK-854] NTK-854