[NXG-396] NXG-396