Transactions

Contribution #11657
Contribution #3786