Last changes to connection helper before 22 March 2013