[FAN-196] FAN-196