Transactions

Contribution #470400
Contribution #160443