Transactions

Contribution #8064
Contribution #8064