[FAN-179] FAN-179