Merge "Bug 1106: Introduced TransactionCommitFailedException."