Add client management interface.
Merge branch 'client-mgmt'