Transactions

Contribution #654350
Contribution #536304