Transactions

Contribution #556831
Contribution #475674