[NTK-338] NTK-338