Update on manage services working
Merge remote-tracking branch 'origin/develop' into develop