coa: Detach existing clients before attaching
Merge remote-tracking branch 'origin/master' into mac