Transactions

Contribution #12619
Contribution #12385