add return into service methods
Merge branch 'feature1' into develop