Transactions

Contribution #687402
Contribution #650655