Transactions

Contribution #7975
Contribution #7974