[NTK-792] NTK-792