Transactions

Contribution #548870
Contribution #548869