Transactions

Contribution #681588
Contribution #558077