Transactions

Contribution #599550
Contribution #598608