[FAN-172] FAN-172