Transactions

Contribution #4653
Contribution #4584