[FAN-272] FAN-272