[FAN-188] FAN-188