Transactions

Contribution #550028
Contribution #532179