[FAN-189] FAN-189