Transactions

Contribution #548530
Contribution #532508