Transactions

Contribution #540905
Contribution #536131