[TASK] Respect new Service merge in Flux