[FAN-227] FAN-227