Merge "Fix transaction aborting"