[FAN-182] FAN-182