Transactions

Contribution #674744
Contribution #667542