Add missing service definition
Merge branch 'master' into yakara
Merge branch 'make_dry' into yakara
Merge branch 'fix_user_group' into yakara