Transactions

Contribution #517623
Contribution #516714