Transactions

Contribution #697199
Contribution #578527