Transactions

Contribution #688217
Contribution #668783