Added account client service
Merge branch 'master' into CLDIDE-1927