[FAN-176] FAN-176