[NTK-363] NTK-363