Transactions

Contribution #670605
Contribution #160507