Transactions

Contribution #670722
Contribution #643254