Merge branch 'clients'