Merge "Bug 4957 No empty transaction for every connection fix"