allow passing ClientConnectionManager
merge remote master