Transactions

Contribution #687701
Contribution #494327