Transactions

Contribution #557305
Contribution #556670