service configuration
Merge branch 'study' into develop