am 911b4be5: Merge "Fix transaction aborting"

* commit '911b4be50c379d052dd9e5f9b59ce91df1340453':
  Fix transaction aborting