[NTK-837] NTK-837