[FAN-194] FAN-194