Internal Client Transport and Manager.
Merge branch 'manager'