Merge "Handle Concurrency issues in Connection" into nyc-dev