[FAN-191] FAN-191