[NTK-367] NTK-367