Transactions

Contribution #669318
Contribution #593434