Client::detach should return a value
Merge branch 'development'