Transactions

Contribution #552325
Contribution #538505