Transactions

Contribution #541345
Contribution #541343