Transactions

Contribution #598327
Contribution #521495