Adding develop
New connection manager
Reqorked for different connection management scheme
MErged from develop