[FAN-178] FAN-178