Transactions

Contribution #647031
Contribution #640357