Transactions

Contribution #706633
Contribution #537587