'Have client' no more
Merge branch 'haveclient'