Merge "Bug 2588: Fix read transaction failures"