Connection now more robust and less deadlocks =)
merge conflicts resolved