[TASK] Respect new Service merge in Flux
Merge pull request #41 from NamelessCoder/servicemerge

[TASK] Respect new Service merge in Flux