Changes in Service to make inline function calls
Merge remote-tracking branch 'origin/master'