Transactions

Contribution #4655
Contribution #4655