[FAN-167] FAN-167