Merge "Fix missing transaction abort error message"