Transactions

Contribution #7904
Contribution #7903