[NTK-779] NTK-779