[FAN-218] FAN-218