Merge "Bug 6635: Correct WriteRunningTx behavior"