[FAN-153] FAN-153