[NTK-794] NTK-794