[NTK-368] NTK-368