[NTK-858] NTK-858