Transactions

Contribution #811726
Contribution #528331