fix regression - service not loading correctly on startup
Merge remote-tracking branch 'origin/master'