[NTK-786] NTK-786