Transactions

Contribution #574105
Contribution #566627