Transactions

Contribution #658317
Contribution #638039