[NTK-366] NTK-366