Transactions

Contribution #12466
Contribution #12375