Transactions

Contribution #6008
Contribution #6009