[NTK-796] NTK-796