clients need some services
Merge branch 'hotfix/1.2.3'