Transactions

Contribution #831478
Contribution #715025