Merge "Bug 1386: Avoid commit deadlock"