[FAN-273] FAN-273