[NTK-268] NTK-268