[FAN-253] FAN-253