Please review: Ticket #514 investigate connection locking