[FAN-268] FAN-268