[NTK-349] NTK-349