Transactions

Contribution #661581
Contribution #656839