Transactions

Contribution #552211
Contribution #542360