[NTK-856] NTK-856